diff --git a/lib/jqueue.py b/lib/jqueue.py
index 833e61cd603863d7b7d96ce78b490069ffe8e419..5597f476e136ead29e7600655bfc04d2eb4fd110 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -1289,6 +1289,7 @@ class JobQueue(object):
         else:
           job.MarkUnfinishedOps(constants.OP_STATUS_ERROR,
                                 "Unclean master daemon shutdown")
+          job.Finalize()
 
         self.UpdateJobUnlocked(job)