diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs
index 53cc35463c..3e14fea2d8 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs
@@ -11,6 +11,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems;
 public sealed class AtmosPipeAppearanceSystem : EntitySystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SharedMapSystem _map = default!;
 
     public override void Initialize()
     {
@@ -55,10 +56,11 @@ public sealed class AtmosPipeAppearanceSystem : EntitySystem
 
         // find the cardinal directions of any connected entities
         var netConnectedDirections = PipeDirection.None;
-        var tile = grid.TileIndicesFor(xform.Coordinates);
+        var tile = _map.TileIndicesFor((xform.GridUid.Value, grid), xform.Coordinates);
         foreach (var neighbour in connected)
         {
-            var otherTile = grid.TileIndicesFor(Transform(neighbour).Coordinates);
+            // TODO z-levels, pipes across grids - we shouldn't assume that the neighboring tile's transform is on the same grid
+            var otherTile = _map.TileIndicesFor((xform.GridUid.Value, grid), Transform(neighbour).Coordinates);
 
             netConnectedDirections |= (otherTile - tile) switch
             {