diff --git a/src/client/game.cpp b/src/client/game.cpp
index d84c493a7..1e62b4b7c 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1743,7 +1743,7 @@ bool Game::getServerContent(bool *aborted)
 		// End condition
 		if (client->mediaReceived() && client->itemdefReceived() &&
 				client->nodedefReceived()) {
-			break;
+			return true;
 		}
 
 		// Error conditions
@@ -1802,7 +1802,9 @@ bool Game::getServerContent(bool *aborted)
 		}
 	}
 
-	return true;
+	*aborted = true;
+	infostream << "Connect aborted [device]" << std::endl;
+	return false;
 }