diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
index f623ccfce12..38ccc5ab574 100644
--- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -97,8 +97,11 @@ private void SetMouseRotatorComponents(EntityUid uid, bool value)
         {
             if(TryComp<MechPilotComponent>(uid, out var mechPilot))
             {
-                EnsureComp<MouseRotatorComponent>(mechPilot.Mech);
-                EnsureComp<NoRotateOnMoveComponent>(mechPilot.Mech);
+                if(!HasComp<MouseRotatorComponent>(mechPilot.Mech))
+                {
+                    EnsureComp<MouseRotatorComponent>(mechPilot.Mech);
+                    EnsureComp<NoRotateOnMoveComponent>(mechPilot.Mech);
+                }
             }
             EnsureComp<MouseRotatorComponent>(uid);
             EnsureComp<NoRotateOnMoveComponent>(uid);