diff --git a/src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/PacketHandler.java b/src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/PacketHandler.java
index 306b9b4..0e6863a 100644
--- a/src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/PacketHandler.java
+++ b/src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/PacketHandler.java
@@ -2,6 +2,7 @@ package com.github.manevolent.ts3j.protocol.packet.handler;
 
 import com.github.manevolent.ts3j.command.Command;
 import com.github.manevolent.ts3j.protocol.Packet;
+import com.github.manevolent.ts3j.protocol.client.ClientConnectionState;
 import com.github.manevolent.ts3j.protocol.socket.client.TeamspeakClientSocket;
 
 import java.io.IOException;
@@ -14,10 +15,16 @@ public abstract class PacketHandler {
         this.clientSocket = clientSocket;
     }
 
+
+    public void handleConnectionStateChanging(ClientConnectionState clientConnectionState) {
+
+    }
+
     public void onUnassigning() throws IOException {
 
     }
 
+
     public void onAssigned() throws IOException, TimeoutException {
 
     }
diff --git a/src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/client/LocalClientHandler.java b/src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/client/LocalClientHandler.java
index ce7280b..3276c7f 100644
--- a/src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/client/LocalClientHandler.java
+++ b/src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/client/LocalClientHandler.java
@@ -14,10 +14,6 @@ public abstract class LocalClientHandler extends PacketHandler {
         this.client = client;
     }
 
-    public void handleConnectionStateChanging(ClientConnectionState clientConnectionState) {
-
-    }
-
     public LocalTeamspeakClientSocket getClient() {
         return client;
     }
diff --git a/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/AbstractTeamspeakClientSocket.java b/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/AbstractTeamspeakClientSocket.java
index a0d24bb..00199a7 100644
--- a/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/AbstractTeamspeakClientSocket.java
+++ b/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/AbstractTeamspeakClientSocket.java
@@ -195,8 +195,9 @@ public abstract class AbstractTeamspeakClientSocket
 
         PacketHandler handler = getHandler();
 
-        if (handler != null)
-            ((LocalClientHandler) handler).handleConnectionStateChanging(state);
+        if (handler != null ) {
+            handler.handleConnectionStateChanging(state);
+        }
 
         Class<? extends PacketHandler> handlerClass = getHandlerClass(state);