diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index ad1d6023fd..3f6f6ef0b6 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -664,6 +664,9 @@ class BBCooker:
         buildname = bb.data.getVar("BUILDNAME", self.configuration.data)
         bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.configuration.event_data)
 
+        # Clear locks
+        bb.fetch.persistent_database_connection = {}
+
         # Execute the runqueue
         runlist = [[item, "do_%s" % task]]
 
@@ -742,6 +745,9 @@ class BBCooker:
             runlist.append([k, "do_%s" % task])
         taskdata.add_unresolved(localdata, self.status)
 
+        # Clear locks
+        bb.fetch.persistent_database_connection = {}
+
         rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist)
 
         self.server.register_idle_function(buildTargetsIdle, rq)