diff --git a/HenryMod/Modules/Prefabs.cs b/HenryMod/Modules/Prefabs.cs
index fd5ab7b..c2932a6 100644
--- a/HenryMod/Modules/Prefabs.cs
+++ b/HenryMod/Modules/Prefabs.cs
@@ -634,6 +634,14 @@ public static void ClearEntityStateMachines(GameObject bodyPrefab)
             if (setStateOnHurt)
             {
                 setStateOnHurt.idleStateMachine = Array.Empty<EntityStateMachine>();
+            }
+			
+			// Ideally this should be changed to your weapon entity state machine
+			// Otherwise it lets you continue attacking during ziprails and similar
+            CharacterBody characterBody = bodyPrefab.GetComponent<CharacterBody>();
+            if (characterBody)
+            {
+                characterBody.vehicleIdleStateMachine = Array.Empty<EntityStateMachine>();
             }
         }