diff --git a/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c b/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c
index d9718e19da0932997ef88e5f928cd5321b0f7c7c..cda15b07017085b95864edf369dfbe3a13bffeee 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c
@@ -613,10 +613,12 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
 			if (job->start && (job->start < job_cond->usage_start))
 				job->start = job_cond->usage_start;
 
-			if (!job->end || job->end > job_cond->usage_end)
+			/* Only set an end time if the job started */
+			if ((job->start && !job->end) ||
+			    (job->end > job_cond->usage_end))
 				job->end = job_cond->usage_end;
 
-			if (!job->start)
+			if (!job->start && job->end)
 				job->start = job->end;
 
 			/*