diff --git a/tools/python/maps_generator/generator/stages.py b/tools/python/maps_generator/generator/stages.py
index 3d27d29bb9..18ad04b09a 100644
--- a/tools/python/maps_generator/generator/stages.py
+++ b/tools/python/maps_generator/generator/stages.py
@@ -125,10 +125,23 @@ def stage_index_world(env, country, **kwargs):
                            generate_search_index=True,
                            cities_boundaries_data=env.cities_boundaries_path,
                            generate_cities_boundaries=True,
-                           generate_cities_ids=True,
                            **kwargs)
 
 
+def stage_cities_ids_world(env, country, **kwargs):
+    run_gen_tool_with_recovery_country(
+        env,
+        env.gen_tool,
+        out=env.get_subprocess_out(country),
+        err=env.get_subprocess_out(country),
+        data_path=env.mwm_path,
+        user_resource_path=env.user_resource_path,
+        output=country,
+        generate_cities_ids=True,
+        **kwargs
+    )
+
+
 def stage_index(env, country, **kwargs):
     _generate_common_index(env, country,
                            generate_search_index=True,
diff --git a/tools/python/maps_generator/maps_generator.py b/tools/python/maps_generator/maps_generator.py
index 5efb5cfaf0..55019a2fb7 100644
--- a/tools/python/maps_generator/maps_generator.py
+++ b/tools/python/maps_generator/maps_generator.py
@@ -123,6 +123,11 @@ def stage_index(env, country, **kwargs):
         stages.stage_index(env, country, **kwargs)
 
 
+@country_stage
+def stage_cities_ids_world(env, country, **kwargs):
+    stages.stage_cities_ids_world(env, country, **kwargs)
+
+
 @country_stage
 def stage_ugc(env, country, **kwargs):
     stages.stage_ugc(env, country, **kwargs)
@@ -161,6 +166,7 @@ def stage_mwm(env):
 
     def build_world(country):
         stage_index(env, country)
+        stage_cities_ids_world(env, country)
         env.finish_mwm(country)
 
     def build_world_coasts(country):