diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py
index 4468facd18..0d44100f10 100644
--- a/bitbake/lib/bb/persist_data.py
+++ b/bitbake/lib/bb/persist_data.py
@@ -59,7 +59,7 @@ class SQLTable(collections.MutableMapping):
                         try:
                             return f(self, *args, **kwargs)
                         except sqlite3.OperationalError as exc:
-                            if 'is locked' in str(exc) and count < 500:
+                            if count < 500 and ('is locked' in str(exc) or 'locking protocol' in str(exc)):
                                 count = count + 1
                                 if reconnect:
                                     self.reconnect()