diff --git a/openerp/service/workers.py b/openerp/service/workers.py
index 2215259695b..9a6485b8fd3 100644
--- a/openerp/service/workers.py
+++ b/openerp/service/workers.py
@@ -379,6 +379,9 @@ class WorkerLongPolling(Worker):
         gevent.monkey.patch_all()
         import gevent_psycopg2
         gevent_psycopg2.monkey_patch()
+        from openerp.modules.registry import RegistryManager
+        from gevent.coros import RLock
+        RegistryManager.registries_lock = RLock()
 
         Worker.start(self)
         self.multi.socket.close()