diff --git a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
index 36244dc23d..c6e2de720a 100644
--- a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
@@ -61,6 +61,8 @@ namespace Content.Client.Atmos.Visualizers
         {
             base.OnChangeData(component);
 
+            if (!component.Owner.TryGetComponent<ITransformComponent>(out var xform))
+                return;
             if (!component.Owner.TryGetComponent<ISpriteComponent>(out var sprite))
                 return;
 
@@ -75,7 +77,7 @@ namespace Content.Client.Atmos.Visualizers
 
             foreach (Layer layerKey in Enum.GetValues(typeof(Layer)))
             {
-                var dir = (PipeDirection) layerKey;
+                var dir = ((PipeDirection) layerKey).RotatePipeDirection(xform.WorldRotation);
                 var layerVisible = state.ConnectedDirections.HasDirection(dir);
 
                 var layer = sprite.LayerMapGet(layerKey);