diff --git a/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java b/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
index 1a8a9c6..6a2f224 100644
--- a/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
+++ b/client/src/main/java/ch/zhaw/pm2/multichat/client/ChatWindowController.java
@@ -49,7 +49,7 @@ public class ChatWindowController {
     }
 
     private void applicationClose() {
-        connectionHandler.setState(DISCONNECTED);
+        disconnect();
     }
 
     @FXML