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 b946a0e..f15db9e 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
@@ -447,10 +447,10 @@ public abstract class AbstractTeamspeakClientSocket
 
         if (responsibleQueue != null) {
             responsibleQueue.put(
-                    packet.getHeader().getPacketId(),
+                    counter.getKey(),
                     response = new PacketResponse(
                             networkPacket,
-                            sendQueue,
+                            responsibleQueue,
                             networkPacket.getHeader().getType().canResend() ? 30 : 0
                     )
             );