diff --git a/src/empire/city.c b/src/empire/city.c
index 8d91c9c0ad..20a016442a 100644
--- a/src/empire/city.c
+++ b/src/empire/city.c
@@ -608,10 +608,10 @@ void empire_city_update_trading_data(int empire_id)
                     change_selling_of_resource(city, RESOURCE_FISH, !NOT_SELLING);
                 }
             }
-        } else if (empire_id == SCENARIO_CUSTOM_EMPIRE) {
-            continue;
         }
-        update_trading_data(empire_id, city);
+        if (empire_id != SCENARIO_CUSTOM_EMPIRE) {
+            update_trading_data(empire_id, city);
+        }
     }
 }
 
diff --git a/src/widget/top_menu_editor.c b/src/widget/top_menu_editor.c
index f61fdd1808..28f0941032 100644
--- a/src/widget/top_menu_editor.c
+++ b/src/widget/top_menu_editor.c
@@ -303,6 +303,7 @@ static void menu_empire_choose(int param)
     clear_state();
     window_go_back();
     scenario_editor_unset_custom_empire();
+    resource_set_mapping(RESOURCE_ORIGINAL_VERSION);
     empire_load(1, scenario_empire_id());
     empire_object_init_cities(scenario_empire_id());
     window_editor_empire_show();
@@ -312,5 +313,6 @@ static void menu_empire_custom(int param)
 {
     clear_state();
     window_go_back();
+    resource_set_mapping(RESOURCE_CURRENT_VERSION);
     window_file_dialog_show(FILE_TYPE_EMPIRE, FILE_DIALOG_LOAD);
 }