diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 641cc70619..6c7b891930 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -124,7 +124,7 @@ class Command:
         else:
             bb.event.fire(CommandCompleted(), self.cooker.event_data)
         self.currentAsyncCommand = None
-
+        self.cooker.finishcommand()
 
 class CommandsSync:
     """
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 4b2e5bf917..0a4dc7eb62 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1246,6 +1246,9 @@ class BBCooker:
         else:
             self.state = state.shutdown
 
+    def finishcommand(self):
+        self.state = state.initial
+
     def initialize(self):
         self.initConfigurationData()