diff --git a/code/datums/components/reskinnable_atom.dm b/code/datums/components/reskinnable_atom.dm
index 5f4847eafcb..ab46ec0c329 100644
--- a/code/datums/components/reskinnable_atom.dm
+++ b/code/datums/components/reskinnable_atom.dm
@@ -13,6 +13,8 @@
 	var/change_base_icon_state = FALSE
 	/// If true, changing the reskin also changes the inhand_icon_state of the atom
 	var/change_inhand_icon_state = FALSE
+	/// If true, changing the reskin also changes the worn_icon_state of the atom
+	var/change_worn_icon_state = TRUE
 	/// If true, unset vars are reset to their original values when applying this skin
 	var/reset_missing = TRUE
 
@@ -86,7 +88,8 @@
 		if(!item_apply_to.greyscale_config_inhand_left)
 			APPLY_VAR_OR_RESET_INITIAL(item_apply_to, lefthand_file, new_lefthand_file, reset_missing)
 			APPLY_VAR_OR_RESET_INITIAL(item_apply_to, righthand_file, new_righthand_file, reset_missing)
-		APPLY_VAR_OR_RESET_INITIAL(item_apply_to, worn_icon_state, new_icon_state, reset_missing)
+		if(change_worn_icon_state)
+			APPLY_VAR_OR_RESET_INITIAL(item_apply_to, worn_icon_state, new_icon_state, reset_missing)
 		if(change_inhand_icon_state || new_inhand_icon_state)
 			APPLY_VAR_OR_RESET_INITIAL(item_apply_to, inhand_icon_state, new_inhand_icon_state || new_icon_state, reset_missing)
 
diff --git a/code/game/objects/items/weaponry/melee/baton.dm b/code/game/objects/items/weaponry/melee/baton.dm
index 639e3d2f020..07a40afabdc 100644
--- a/code/game/objects/items/weaponry/melee/baton.dm
+++ b/code/game/objects/items/weaponry/melee/baton.dm
@@ -758,6 +758,7 @@
 	abstract_type = /datum/atom_skin/stunsword
 	change_inhand_icon_state = TRUE
 	change_base_icon_state = TRUE
+	change_worn_icon_state = FALSE
 
 /datum/atom_skin/stunsword/default
 	preview_name = "Default"
diff --git a/icons/obj/weapons/baton.dmi b/icons/obj/weapons/baton.dmi
index c9dc238a651..181c635c72f 100644
Binary files a/icons/obj/weapons/baton.dmi and b/icons/obj/weapons/baton.dmi differ