diff --git a/syncplay/server.py b/syncplay/server.py
index c098bf0..0d50c82 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -73,8 +73,9 @@ class SyncFactory(Factory):
         self._roomManager.broadcast(watcher, l)
 
     def removeWatcher(self, watcher):
-        self.sendLeftMessage(watcher)
-        self._roomManager.removeWatcher(watcher)
+        if watcher.getRoom():
+            self.sendLeftMessage(watcher)
+            self._roomManager.removeWatcher(watcher)
 
     def sendLeftMessage(self, watcher):
         l = lambda w: w.sendSetting(watcher.getName(), watcher.getRoom(), None, {"left": True})