diff --git a/src/net/common/serveracceptthread.cpp b/src/net/common/serveracceptthread.cpp
index bfe69244..ebd31bf0 100644
--- a/src/net/common/serveracceptthread.cpp
+++ b/src/net/common/serveracceptthread.cpp
@@ -79,7 +79,7 @@ ServerAcceptThread::Main()
 		Listen();
 		GetLobbyThread().Run();
 
-		while (!ShouldTerminate())
+		while (!ShouldTerminate() && !GetLobbyThread().Join(0))
 		{
 			// The main server thread is simple. It only accepts connections.
 			AcceptLoop();