diff --git a/src/hacks/LagExploit.cpp b/src/hacks/LagExploit.cpp
index 0054e2c4..54beb961 100644
--- a/src/hacks/LagExploit.cpp
+++ b/src/hacks/LagExploit.cpp
@@ -296,8 +296,7 @@ void CreateMove()
     {
 
         if ((g_pUserCmd->buttons & IN_ATTACK) && !bWasHolding &&
-            HasCondition<TFCond_Cloaked>(LOCAL_E) &&
-            g_pLocalPlayer->weapon()->m_iClassID == CL_CLASS(CTFKnife))
+            HasCondition<TFCond_Cloaked>(LOCAL_E))
         {
             g_pUserCmd->buttons &= ~IN_ATTACK;
             g_pUserCmd->buttons |= IN_ATTACK2;
@@ -349,21 +348,18 @@ void CreateMove()
     {
         if (cloak)
         {
-            if (g_pLocalPlayer->weapon()->m_iClassID == CL_CLASS(CTFKnife))
+            if ((g_pUserCmd->buttons & IN_ATTACK2) && !bWasHolding &&
+                !HasCondition<TFCond_Cloaked>(LOCAL_E))
             {
-                if ((g_pUserCmd->buttons & IN_ATTACK2) && !bWasHolding &&
-                    !HasCondition<TFCond_Cloaked>(LOCAL_E))
-                {
-                    amount = 1 * 90;
-                }
+                amount = 1 * 90;
+            }
 
-                if ((g_pUserCmd->buttons & IN_ATTACK) && !bWasHolding &&
-                    HasCondition<TFCond_Cloaked>(LOCAL_E))
-                {
-                    g_pUserCmd->buttons &= ~IN_ATTACK;
-                    g_pUserCmd->buttons |= IN_ATTACK2;
-                    amount = 2 * 90;
-                }
+            if ((g_pUserCmd->buttons & IN_ATTACK) && !bWasHolding &&
+                HasCondition<TFCond_Cloaked>(LOCAL_E))
+            {
+                g_pUserCmd->buttons &= ~IN_ATTACK;
+                g_pUserCmd->buttons |= IN_ATTACK2;
+                amount = 2 * 90;
             }
             bWasHolding = (g_pUserCmd->buttons & IN_ATTACK) ||
                           (g_pUserCmd->buttons & IN_ATTACK2);