diff --git a/planet/Objects.ocd/Libraries.ocd/AimManager.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/AimManager.ocd/Script.c
index a73ea6bf4..994476716 100644
--- a/planet/Objects.ocd/Libraries.ocd/AimManager.ocd/Script.c
+++ b/planet/Objects.ocd/Libraries.ocd/AimManager.ocd/Script.c
@@ -254,6 +254,8 @@ public func StopAim()
 
 private func DoStopAim()
 {
+	if (!aim_weapon)
+		ResetHands();
 	if(!aim_weapon->~FinishedAiming(this, aim_angle)) // return 1 means the weapon goes on doing something (e.g. start aiming) then we don't reset
 		ResetHands();
 }