diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 2b37619ae3..6ba82a338c 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -573,11 +573,6 @@ class RunQueueData:
             fn = taskData.fn_index[fnid]
             self.target_pairs.append((fn, target[1]))
 
-            # Remove stamps for targets if force mode active
-            if self.cooker.configuration.force:
-                logger.verbose("Remove stamp %s, %s", target[1], fn)
-                bb.build.del_stamp(target[1], self.dataCache, fn)
-
             if fnid in taskData.failed_fnids:
                 continue
 
@@ -724,6 +719,12 @@ class RunQueueData:
 
         self.hashdata = hashdata
 
+        # Remove stamps for targets if force mode active
+        if self.cooker.configuration.force:
+            for (fn, target) in self.target_pairs:
+                logger.verbose("Remove stamp %s, %s", target, fn)
+                bb.build.del_stamp(target, self.dataCache, fn)
+
         return len(self.runq_fnid)
 
     def dump_data(self, taskQueue):