diff --git a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
index 5f8d4a25df..92cdf16b3c 100644
--- a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
@@ -101,7 +101,7 @@ namespace Content.Client.GameObjects.EntitySystems
             }
 
             // Up.
-            if (_timeHeld >= AttackTimeThreshold)
+            if (UseOrAttackIsDown && _timeHeld >= AttackTimeThreshold)
             {
                 // Attack.
                 SendMsg(ContentKeyFunctions.Attack, BoundKeyState.Down);