diff --git a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs
index 30fc6a15a0..ae8e4c43b6 100644
--- a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/WindowSystem.cs
@@ -34,7 +34,13 @@ namespace Content.Client.GameObjects.EntitySystems
             // Performance: This could be spread over multiple updates, or made parallel.
             while (_dirtyEntities.Count > 0)
             {
-                _dirtyEntities.Dequeue().GetComponent<WindowComponent>().UpdateSprite();
+                var entity = _dirtyEntities.Dequeue();
+                if (entity.Deleted)
+                {
+                    continue;
+                }
+
+                entity.GetComponent<WindowComponent>().UpdateSprite();
             }
         }
     }