diff --git a/lib/jqueue.py b/lib/jqueue.py
index fe61c22ee83672d0093565d741838f564ac2b3e0..bd4d98625e34279414fc11dc971a3dc27e8ea5d0 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -945,11 +945,11 @@ class JobQueue(object):
 
       status = job.CalcStatus()
 
-      if status in (constants.JOB_STATUS_QUEUED,
-                    constants.JOB_STATUS_WAITLOCK):
+      if status in (constants.JOB_STATUS_QUEUED, ):
         self._wpool.AddTask((job, ))
 
       elif status in (constants.JOB_STATUS_RUNNING,
+                      constants.JOB_STATUS_WAITLOCK,
                       constants.JOB_STATUS_CANCELING):
         logging.warning("Unfinished job %s found: %s", job.id, job)
         job.MarkUnfinishedOps(constants.OP_STATUS_ERROR,