diff --git a/Mage.Server/src/main/java/mage/server/ChatSession.java b/Mage.Server/src/main/java/mage/server/ChatSession.java
index 1a3a3914ef..485a37a102 100644
--- a/Mage.Server/src/main/java/mage/server/ChatSession.java
+++ b/Mage.Server/src/main/java/mage/server/ChatSession.java
@@ -146,7 +146,7 @@ public class ChatSession {
                 if (user.isPresent()) {
                     user.get().fireCallback(clientCallback);
                 } else {
-                    clientsToRemove = new HashSet<>();
+                    clientsToRemove.add(userId);
                 }
             }
             for (UUID userIdToRemove : clientsToRemove) {