diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java
index 600d901..0ab6a44 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserRegistry.java
@@ -39,4 +39,14 @@ public class UserRegistry {
         }
         return Optional.empty();
     }
+
+    // TODO: Add to EventRegistry with DisconnectEvent
+    public synchronized void onDisconnect(SessionId sessionId) {
+        Optional<User> user = findBySessionId(sessionId);
+
+        if (user.isPresent()) {
+            user.get().markDisconnected();
+        }
+    }
+
 }
\ No newline at end of file