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 1bca7b3..e56a7b2 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
@@ -163,6 +163,8 @@ public class LocalTeamspeakClientSocket
 
             try {
                 socket.receive(packet);
+            } catch (SocketTimeoutException ex) {
+                throw ex;
             } catch (SocketException ex) {
                 if (socket.isClosed()) throw new EOFException();
                 else throw ex;
diff --git a/src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java b/src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java
index 8dd35af..cd3e49e 100644
--- a/src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java
+++ b/src/test/java/com/github/manevolent/ts3j/ServerConnectionTest.java
@@ -27,8 +27,7 @@ public class ServerConnectionTest  {
         );
 
         identity.improveSecurity(10);
-        while (true) {
-            try {
+
                 client.setIdentity(identity);
 
                 client.setNickname("Hello from Java");
@@ -152,14 +151,7 @@ public class ServerConnectionTest  {
 
                 client.listClients();
 
-                Thread.sleep(1000L);
+                Thread.sleep(10000L);
 
-                client.listClients();
-
-                client.disconnect();
-            } catch (Throwable ex) {
-                ex.printStackTrace();
-            }
-        }
     }
 }