diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml
index 1e64d18a1c3..4099dc7953d 100644
--- a/Resources/Prototypes/Traits/physical.yml
+++ b/Resources/Prototypes/Traits/physical.yml
@@ -824,10 +824,7 @@
       traits:
         - CyberEyes
   functions:
-    - !type:TraitAddComponent
-      components:
-        - type: ThermalVision
-          toggleAction: ToggleThermalVision
+    - !type:TraitReplaceComponent
         - type: PassiveDamage
           allowedStates:
           - Alive
@@ -836,7 +833,10 @@
           damage:
             groups:
               Burn: 0.3
-    - !type:TraitReplaceComponent
+    - !type:TraitAddComponent
+      components:
+        - type: ThermalVision
+          toggleAction: ToggleThermalVision
         - type: PassiveDamage
           allowedStates:
           - Alive
@@ -1080,8 +1080,6 @@
   functions:
     - !type:TraitAddComponent
       components:
-        - type: ThermalVision
-          toggleAction: ToggleThermalVision
     - !type:TraitReplaceComponent
         - type: PassiveDamage
           allowedStates:
@@ -1091,6 +1089,8 @@
           damage:
             groups:
               Burn: 0.3
+        - type: ThermalVision
+          toggleAction: ToggleThermalVision
     - !type:TraitPushDescription
       descriptionExtensions:
         - description: examine-thermal-vision-message