diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 446e24d4f8..19e3eee3fa 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -112,7 +112,6 @@ struct PacketWriter : SaveFilter {
 		 * we need to handle the save finish as well as the
 		 * next connection might just be requesting a map. */
 		WaitTillSaved();
-		ProcessAsyncSaveFinish();
 	}
 
 	/**
@@ -624,6 +623,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendMap()
 	}
 
 	if (this->status == STATUS_AUTHORIZED) {
+		WaitTillSaved();
 		this->savegame = new PacketWriter(this);
 
 		/* Now send the _frame_counter and how many packets are coming */