diff --git a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
index 430ab94becf47123d103b84d59d96aefd732cd2e..4734682300f2c615192b77d6a0c00d922c9b8120 100644
--- a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
+++ b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
@@ -2551,10 +2551,11 @@ extern int jobacct_storage_p_job_start(void *db_conn,
 	msg.msg_type      = DBD_JOB_START;
 	msg.data          = &req;
 
-	/* if we already have the db_index don't wait around for it
-	 * again just send the message.  This also applies when the
-	 * slurmdbd is down and we are about to remove the job from
-	 * the system.
+	/* If we already have the db_index don't wait around for it
+	 * again just send the message when not resizing.  This also applies
+	 * when the slurmdbd is down and we are about to remove the job from
+	 * the system.  We don't want to wait for the db_index in that situation
+	 * either.
 	 */
 	if ((req.db_index && !IS_JOB_RESIZING(job_ptr))
 	    || (!req.db_index && IS_JOB_FINISHED(job_ptr))) {