diff --git a/src/main/java/ClientHandler.java b/src/main/java/ClientHandler.java
index fa4b924..74fa305 100644
--- a/src/main/java/ClientHandler.java
+++ b/src/main/java/ClientHandler.java
@@ -39,7 +39,7 @@ public class ClientHandler implements Runnable {
       throw new RuntimeException(e); // Handle exceptions by throwing a runtime exception
     } 
     finally {
-      //chatServer.removeClient(this);
+      chatServer.removeClient(this);
       chatServer.broadcastMessage(name + " disconnected."); // Broadcast a message when the client is disconnected
 
       // Close resources in the finally block