diff --git a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
index 8e8bb0dfe8..882d81bbbe 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt
@@ -63,11 +63,6 @@ class CityStateFunctions(val civInfo: Civilization) {
                 civInfo.cityStateUniqueUnit = possibleUnits.random().name
         }
 
-        // Set turns to elections to a random number so not every city-state has the same election date
-        if (civInfo.gameInfo.isEspionageEnabled()) {
-            civInfo.addFlag(CivFlags.TurnsTillCityStateElection.name, Random.nextInt(civInfo.gameInfo.ruleset.modOptions.constants.cityStateElectionTurns + 1))
-        }
-
         // TODO: Return false if attempting to put a religious city-state in a game without religion
 
         return true
diff --git a/core/src/com/unciv/logic/civilization/managers/TurnManager.kt b/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
index 02da82a170..cb1114148e 100644
--- a/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
+++ b/core/src/com/unciv/logic/civilization/managers/TurnManager.kt
@@ -262,8 +262,9 @@ class TurnManager(val civInfo: Civilization) {
 
         if (civInfo.isCityState()) {
             civInfo.questManager.endTurn()
-            // Todo: Remove this later
-            // The purpouse of this addition is to migrate the old election system to the new flag system
+
+            // Set turns to elections to a random number so not every city-state has the same election date
+            // May be called at game start or when migrating a game from an older version
             if (civInfo.gameInfo.isEspionageEnabled() && !civInfo.hasFlag(CivFlags.TurnsTillCityStateElection.name)) {
                 civInfo.addFlag(CivFlags.TurnsTillCityStateElection.name, Random.nextInt(civInfo.gameInfo.ruleset.modOptions.constants.cityStateElectionTurns + 1))
             }