diff --git a/src/game/bondgun.c b/src/game/bondgun.c
index 74abdbb36..6a6e3fe25 100644
--- a/src/game/bondgun.c
+++ b/src/game/bondgun.c
@@ -6899,7 +6899,8 @@ void bgun0f0a5550(s32 handnum)
 
 	hand->visible = true;
 
-	if (!weaponHasFlag(weaponnum, WEAPONFLAG_00000040)
+	if ((weaponnum <= WEAPON_UNARMED && hand->state != HANDSTATE_ATTACK)
+			|| !weaponHasFlag(weaponnum, WEAPONFLAG_00000040)
 			|| weaponHasFlag(weaponnum, WEAPONFLAG_00000080)
 			|| hand->mode == HANDMODE_6
 			|| hand->mode == HANDMODE_7