diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs
index 287e8d41..18c24efe 100644
--- a/MinecraftClient/McTcpClient.cs
+++ b/MinecraftClient/McTcpClient.cs
@@ -369,7 +369,10 @@ namespace MinecraftClient
                 cmdprompt.Abort();
 
             if (timeoutdetector != null)
+            {
                 timeoutdetector.Abort();
+                timeoutdetector = null;
+            }
 
             Thread.Sleep(1000);
 
@@ -724,6 +727,12 @@ namespace MinecraftClient
         {
             world.Clear();
 
+            if (timeoutdetector != null)
+            {
+                timeoutdetector.Abort();
+                timeoutdetector = null;
+            }
+
             bool will_restart = false;
 
             switch (reason)