diff --git a/OpenRA.Game/Network/Connection.cs b/OpenRA.Game/Network/Connection.cs
index 7670918a51..b2bce7a393 100755
--- a/OpenRA.Game/Network/Connection.cs
+++ b/OpenRA.Game/Network/Connection.cs
@@ -14,6 +14,7 @@ using System.IO;
 using System.Net.Sockets;
 using System.Threading;
 using OpenRA.Server;
+using OpenRA.Support;
 
 namespace OpenRA.Network
 {
@@ -148,7 +149,9 @@ namespace OpenRA.Network
 			GC.SuppressFinalize( this );
 
 			t.Abort();
-			t.Join();
+			socket.Client.Close();
+			using( new PerfSample( "Thread.Join" ))
+				t.Join();
 		}
 		
 		~NetworkConnection() { Dispose(); }