diff --git a/library/Core.cpp b/library/Core.cpp
index d54218b5c..abcba2e78 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -2197,6 +2197,11 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
         std::cerr << "loaded map in prerelease build" << std::endl;
     }
 
+    if (event == SC_WORLD_LOADED)
+    {
+        doLoadData(out);
+    }
+
     EventManager::onStateChange(out, event);
 
     buildings_onStateChange(out, event);
@@ -2211,10 +2216,6 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
     {
         Persistence::Internal::clear();
     }
-    if (event == SC_WORLD_LOADED)
-    {
-        doLoadData(out);
-    }
 }
 
 void Core::doSaveData(color_ostream &out)