diff --git a/Mage.Server/src/main/java/mage/server/ChatManager.java b/Mage.Server/src/main/java/mage/server/ChatManager.java
index e48219bdf40..4d2bcabc4ff 100644
--- a/Mage.Server/src/main/java/mage/server/ChatManager.java
+++ b/Mage.Server/src/main/java/mage/server/ChatManager.java
@@ -88,7 +88,7 @@ public class ChatManager {
 		}
 	}
 
-	void removeUser(UUID userId) {
+	public void removeUser(UUID userId) {
 		for (ChatSession chat: chatSessions.values()) {
 			chat.kill(userId);
 		}
diff --git a/Mage.Server/src/main/java/mage/server/UserManager.java b/Mage.Server/src/main/java/mage/server/UserManager.java
index f535a2f6a36..5776ebbe3ca 100644
--- a/Mage.Server/src/main/java/mage/server/UserManager.java
+++ b/Mage.Server/src/main/java/mage/server/UserManager.java
@@ -100,6 +100,7 @@ public class UserManager {
 	}
 	
 	public void disconnect(UUID userId) {
+        ChatManager.getInstance().removeUser(userId);
 		if (users.containsKey(userId)) {
             logger.info("user disconnected " + userId);
 			users.get(userId).setSessionId("");