diff --git a/Source/Building_Window.cs b/Source/Building_Window.cs
index 7d46065..f04ca70 100644
--- a/Source/Building_Window.cs
+++ b/Source/Building_Window.cs
@@ -634,7 +634,7 @@ private bool GizmoInhibitor(Gizmo gizmo)
 
         private void MapUpdateHandler(object sender, MapUpdateWatcher.MapUpdateInfo info)
         {
-            if (info.map != Map) return;
+            if (!Spawned || info.map != Map) return;
             var cellIdx = info.Origin;
             var cellPos = info.origin;
             bool roof = sender is RoofGrid;
@@ -960,4 +960,4 @@ private bool ShouldBleed()
 
         #endregion nested
     }
-}
\ No newline at end of file
+}