diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java
index 2ba56676..7cdb2c78 100644
--- a/src/engine/server/world/WorldServer.java
+++ b/src/engine/server/world/WorldServer.java
@@ -535,6 +535,10 @@ public class WorldServer {
         DbManager.CityQueries.GET_ALL_CITIES();
         Logger.info("Loading all NPCs");
         DbManager.NPCQueries.GET_ALL_NPCS();
+
+        // NPCs are cached now; Building.runAfterLoad falls back to the NPC cache.
+        BuildingManager._npcBuildingOwners.clear();
+
         Logger.info("Loading all Mobiles");
         DbManager.MobQueries.GET_ALL_MOBS();