diff --git a/openerp/service/server.py b/openerp/service/server.py
index a075f65cb5e..dad7f78e5dc 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -478,6 +478,8 @@ class PreforkServer(CommonServer):
         self.long_polling_pid = popen.pid
 
     def worker_pop(self, pid):
+        if pid == self.long_polling_pid:
+            self.long_polling_pid = None
         if pid in self.workers:
             _logger.debug("Worker (%s) unregistered", pid)
             try: