diff --git a/src/engine/db/handlers/dbWarehouseHandler.java b/src/engine/db/handlers/dbWarehouseHandler.java
index 9ca0cc10..9892299d 100644
--- a/src/engine/db/handlers/dbWarehouseHandler.java
+++ b/src/engine/db/handlers/dbWarehouseHandler.java
@@ -153,7 +153,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
 
                 // Locate warehouse building
                 for (Building building : city.parentZone.zoneBuildingSet) {
-                    if (building.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.WAREHOUSE)) {
+                    if (building.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.WAREHOUSE) && building.getRank() != -1) {
                         city.warehouse.building = building;
                         break;
                     }