diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java
index c81c119..9ad41cd 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java
@@ -55,7 +55,7 @@ public class SessionManager {
      * @param id of the client to disconnect
      */
     public void disconnect(SessionId id) {
-        SessionHandle handle = sessions.get(id);
+        SessionHandle handle = sessions.remove(id);
         if (handle == null) {
             logger.warn(
                     "Requested to disconnect client with id {}. Failed as client is not found",