diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 010105a60f..e781ff8b30 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1674,6 +1674,7 @@ class BBCooker:
         return
 
     def post_serve(self):
+        self.shutdown(force=True)
         prserv.serv.auto_shutdown()
         if self.hashserv:
             self.hashserv.process.terminate()