diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs
index b6ebaf739be8..4cd575cbd4a3 100644
--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -103,7 +103,8 @@ private void OnTerminating(EntityUid uid, EdgeSpreaderComponent component, ref E
 
         foreach (var neighbor in neighbors)
         {
-            EnsureComp<ActiveEdgeSpreaderComponent>(neighbor);
+            if (!TerminatingOrDeleted(neighbor))
+                EnsureComp<ActiveEdgeSpreaderComponent>(neighbor);
         }
     }