diff --git a/Content.Server/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs
index 780c2974e1..f67e78e587 100644
--- a/Content.Server/NodeContainer/Nodes/PipeNode.cs
+++ b/Content.Server/NodeContainer/Nodes/PipeNode.cs
@@ -38,20 +38,22 @@ namespace Content.Server.NodeContainer.Nodes
 
         public void AddAlwaysReachable(PipeNode pipeNode)
         {
-            if (NodeGroup == null) return;
             if (pipeNode.NodeGroupID != NodeGroupID) return;
             _alwaysReachable ??= new();
             _alwaysReachable.Add(pipeNode);
-            EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
+
+            if (NodeGroup != null)
+                EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
         }
 
         public void RemoveAlwaysReachable(PipeNode pipeNode)
         {
             if (_alwaysReachable == null) return;
-            if (NodeGroup == null) return;
-            if (pipeNode.NodeGroupID != NodeGroupID) return;
+
             _alwaysReachable.Remove(pipeNode);
-            EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
+
+            if (NodeGroup != null)
+                EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
         }
 
         /// <summary>