diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
index 70104a0882..3deafa0cf7 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -54,7 +54,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.
+    noRot: true # TODO: This is a hack so pipe connectors don't look wrong. Also see BaseGasThermoMachine.
   - type: Appearance
     visuals:
     - type: PipeConnectorVisualizer
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
index f628e58595..7082154d40 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
@@ -124,10 +124,12 @@
     - type: Sprite
       netsync: false
       sprite: Structures/Piping/Atmospherics/thermomachine.rsi
+      noRot: true # TODO: This is a hack so pipe connectors don't look wrong. Also see GasPipeBase.
     - type: Appearance
       visuals:
         - type: PipeConnectorVisualizer
         - type: PipeColorVisualizer
+    - type: Rotatable
     - type: GasThermoMachine
     - type: AtmosPipeColor
     - type: AtmosDevice