diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index 0f416e0cf30..28be1dc7db0 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -212,6 +212,10 @@
 		else
 			to_chat(user, span_danger("The baton is still charging!"))
 			return
+	else if(user.combat_mode && !turned_on)
+		..()
+		user.do_attack_animation(M)
+		return
 	else
 		M.visible_message(span_warning("[user] prods [M] with [src]. Luckily it was off."), \
 					span_warning("[user] prods you with [src]. Luckily it was off."))