diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm
index 694b84e8943..88c0b1431a8 100644
--- a/code/datums/components/transforming.dm
+++ b/code/datums/components/transforming.dm
@@ -36,6 +36,8 @@
 	var/clumsy_check
 	/// If we get sharpened with a whetstone, save the bonus here for later use if we un/redeploy
 	var/sharpened_bonus = 0
+	/// Dictate whether we change inhands or not
+	var/inhand_icon_change
 	/// Cooldown in between transforms
 	COOLDOWN_DECLARE(transform_cooldown)
 
@@ -51,6 +53,7 @@
 		clumsy_check = TRUE,
 		list/attack_verb_continuous_on,
 		list/attack_verb_simple_on,
+		inhand_icon_change = TRUE,
 		)
 
 	if(!isitem(parent))
@@ -188,7 +191,8 @@
 	source.hitsound = hitsound_on
 	source.w_class = w_class_on
 	source.icon_state = "[source.icon_state]_on"
-	source.inhand_icon_state = "[source.inhand_icon_state]_on"
+	if(inhand_icon_change)
+		source.inhand_icon_state = "[source.inhand_icon_state]_on"
 	if(ismob(source.loc))
 		var/mob/loc_mob = source.loc
 		loc_mob.update_held_items()
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index f4c730782f9..0545dc3a3dc 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -110,7 +110,8 @@
 		throwforce_on = throwforce, \
 		hitsound_on = hitsound, \
 		w_class_on = w_class, \
-		clumsy_check = FALSE)
+		clumsy_check = FALSE, \
+		inhand_icon_change = FALSE,)
 	RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
 
 /*