diff --git a/TrueCraft/RemoteClient.cs b/TrueCraft/RemoteClient.cs
index 3e6d20f..5940cde 100644
--- a/TrueCraft/RemoteClient.cs
+++ b/TrueCraft/RemoteClient.cs
@@ -313,7 +313,7 @@ namespace TrueCraft
 
                 try
                 {
-                    sem.Wait(cancel.Token);
+                    sem.Wait(500, cancel.Token);
                 }
                 catch (OperationCanceledException)
                 {
@@ -321,6 +321,11 @@ namespace TrueCraft
                 catch (NullReferenceException)
                 {
                 }
+                catch (TimeoutException)
+                {
+                    Server.DisconnectClient(this);
+                    return;
+                }
 
                 var packets = PacketReader.ReadPackets(this, e.Buffer, e.Offset, e.BytesTransferred);