diff --git a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
index c6e2de720a..f85e3b7bf4 100644
--- a/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
+++ b/Content.Client/Atmos/Visualizers/PipeConnectorVisualizer.cs
@@ -77,11 +77,8 @@ namespace Content.Client.Atmos.Visualizers
 
             foreach (Layer layerKey in Enum.GetValues(typeof(Layer)))
             {
-                var dir = ((PipeDirection) layerKey).RotatePipeDirection(xform.WorldRotation);
-                var layerVisible = state.ConnectedDirections.HasDirection(dir);
-
                 var layer = sprite.LayerMapGet(layerKey);
-                sprite.LayerSetVisible(layer, layerVisible && subfloor);
+                sprite.LayerSetVisible(layer, state.ConnectedDirections.HasDirection(((PipeDirection)layerKey)) && subfloor);
                 sprite.LayerSetColor(layer, color);
             }
         }
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index 088cc4d0d0..738b0bf2b5 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -53,6 +53,7 @@
     sprite: Structures/Piping/Atmospherics/pipe.rsi
     drawdepth: BelowFloor
     netsync: false
+    noRot: true # TODO: This is a hack so pipe connectors don't look wrong.
   - type: Appearance
     visuals:
     - type: PipeConnectorVisualizer