diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index aa56b3d830be7..69476856ce918 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -875,7 +875,6 @@ struct AIConfigWindow : public Window {
 					new_value = min(MAX_COMPANIES - 1, GetGameSettings().difficulty.max_no_competitors + 1);
 				}
 				IConsoleSetSetting("difficulty.max_no_competitors", new_value);
-				this->InvalidateData();
 				break;
 			}
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 220628b0069bb..d16cff7a1d258 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1174,6 +1174,7 @@ static bool MaxNoAIsChange(int32 i)
 		ShowErrorMessage(STR_WARNING_NO_SUITABLE_AI, INVALID_STRING_ID, WL_CRITICAL);
 	}
 
+	InvalidateWindowClassesData(WC_GAME_OPTIONS, 0);
 	return true;
 }