diff --git a/src/engine/devcmd/cmds/RemoveObjectCmd.java b/src/engine/devcmd/cmds/RemoveObjectCmd.java
index dea5fbf2..ab30ec48 100644
--- a/src/engine/devcmd/cmds/RemoveObjectCmd.java
+++ b/src/engine/devcmd/cmds/RemoveObjectCmd.java
@@ -132,8 +132,8 @@ public class RemoveObjectCmd extends AbstractDevCmd {
         if ((building.getBlueprint() != null) && (building.getBlueprint().getBuildingGroup() == BuildingGroup.WAREHOUSE)) {
             City city = City.getCity(building.getParentZone().playerCityUUID);
 
-            if (city != null)
-                city.warehouse = null;
+            DbManager.WarehouseQueries.DELETE_WAREHOUSE(city.warehouse);
+            city.warehouse = null;
 
         }