diff --git a/src/game.cpp b/src/game.cpp
index 24ecc99d2..3dcfcfaa9 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2217,7 +2217,8 @@ bool Game::connectToServer(const std::string &playername,
 			}
 
 			wait_time += dtime;
-			if (wait_time > 10) {
+			// Only time out if we aren't waiting for the server we started
+			if ((*address != "") && (wait_time > 10)) {
 				*error_message = "Connection timed out.";
 				errorstream << *error_message << std::endl;
 				break;