diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index ef95eb46b..2a6b099b8 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -2112,6 +2112,10 @@ class RunQueueExecute:
                     bb.debug(1, "Deferred task %s now buildable" % t)
                     del self.sq_deferred[t]
                     update_scenequeue_data([t], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False)
+                    # A task which already completed will never complete again so must
+                    # not become the new blocker, else the remaining tasks never get released
+                    if t in self.runq_complete:
+                        continue
                     found = t
                 else:
                     bb.debug(1, "Deferring %s after %s" % (t, found))
