diff --git a/src/game.c b/src/game.c
index 0bf0a147f4..9ac5b51d3a 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1066,6 +1066,7 @@ void game_load_or_quit_no_save_prompt()
 			gInputFlags &= ~INPUT_FLAG_5;
 		}
 		gGameSpeed = 1;
+		gFirstTimeSave = 1;
 		title_load();
 		break;
 	default:
diff --git a/src/network/network.cpp b/src/network/network.cpp
index be2a79f4ed..a89854dc50 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -1540,6 +1540,7 @@ void Network::Client_Handle_MAP(NetworkConnection& connection, NetworkPacket& pa
 			server_srand0_tick = 0;
 			// window_network_status_open("Loaded new map from network");
 			_desynchronised = false;
+			gFirstTimeSave = 1;
 
 			// Notify user he is now online and which shortcut key enables chat
 			network_chat_show_connected_message();