diff --git a/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java b/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java
index f25133b..b0faefe 100644
--- a/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java
+++ b/src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java
@@ -781,7 +781,11 @@ public class LocalTeamspeakClientSocket
                 new CommandSingleParameter("clid", Integer.toString(clientId))
         );
 
-        Iterable<Client> clients = executeCommand(command, x -> new Client(x.toMap())).get();
+        Iterable<Client> clients = executeCommand(command, x -> {
+            Map<String, String> map = x.toMap();
+            map.put("clid", Integer.toString(clientId));
+            return new Client(map);
+        }).get();
         return clients.iterator().next();
     }
 
diff --git a/src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java b/src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java
index c634bc1..3ca15f1 100644
--- a/src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java
+++ b/src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java
@@ -1,6 +1,5 @@
 package com.github.manevolent.ts3j;
 
-import com.github.manevolent.ts3j.api.Channel;
 import com.github.manevolent.ts3j.api.Client;
 import com.github.manevolent.ts3j.identity.LocalIdentity;
 import com.github.manevolent.ts3j.protocol.client.ClientConnectionState;