diff --git a/source/glest_game/menu/menu_state_join_game.cpp b/source/glest_game/menu/menu_state_join_game.cpp
index 487193e0..5172de63 100644
--- a/source/glest_game/menu/menu_state_join_game.cpp
+++ b/source/glest_game/menu/menu_state_join_game.cpp
@@ -547,8 +547,10 @@ void MenuStateJoinGame::connectToServer() {
 	labelInfo.setText("");
 
 	//save server ip
-	config.setString("ServerIp", serverIp.getString());
-	config.save();
+	if(config.getString("ServerIp") != serverIp.getString()) {
+		config.setString("ServerIp", serverIp.getString());
+		config.save();
+	}
 
 	for(time_t elapsedWait = time(NULL);
 		clientInterface->getIntroDone() == false &&