diff --git a/src/Ganeti/JQScheduler.hs b/src/Ganeti/JQScheduler.hs
index c13d604294e024d73e8368ced6251c4011467e4e..7adb620edac3fa01befc5fdbfc451373d03a823c 100644
--- a/src/Ganeti/JQScheduler.hs
+++ b/src/Ganeti/JQScheduler.hs
@@ -321,7 +321,9 @@ checkForDeath state jobWS = do
       sjid = show $ fromJobId jid
       livelock = qjLivelock job
   logDebug $ "Livelock of job " ++ sjid ++ " is " ++ show livelock
-  died <- maybe (return False) isDead livelock
+  died <- maybe (return False) isDead
+          . mfilter (/= jqLivelock state)
+          $ livelock
   when died $ do
     logInfo $ "Detected death of job " ++ sjid
     -- if we manage to remove the job from the queue, we own the job file