diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
index fbfeb038a07..a52bcd649ec 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm
@@ -9,7 +9,6 @@
 	new /obj/item/weapon/storage/firstaid/regular(src)
 	new /obj/item/weapon/storage/box/handcuffs(src)
 	new /obj/item/device/aicard(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/device/flash/handheld(src)
 	if(prob(50))
 		new /obj/item/ammo_box/magazine/m50(src)
@@ -32,7 +31,6 @@
 	new /obj/item/weapon/storage/box/teargas(src)
 	new /obj/item/weapon/storage/box/flashes(src)
 	new /obj/item/weapon/storage/box/handcuffs(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/weapon/shield/riot/tele(src)
 
 /obj/structure/closet/secure_closet/ertMed
@@ -48,7 +46,6 @@
 	new /obj/item/weapon/storage/firstaid/fire(src)
 	new /obj/item/weapon/storage/firstaid/brute(src)
 	new /obj/item/weapon/storage/firstaid/regular(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/weapon/defibrillator/compact/combat/loaded(src)
 	new /obj/machinery/bot/medbot(src)
 
@@ -65,7 +62,6 @@
 	new /obj/item/stack/sheet/glass(src, 50)
 	new /obj/item/clothing/shoes/magboots(src)
 	new /obj/item/weapon/storage/box/metalfoam(src)
-	new /obj/item/weapon/melee/baton/loaded(src)
 	new /obj/item/weapon/rcd_ammo/large(src)
 	new /obj/item/weapon/rcd_ammo/large(src)
 	new /obj/item/weapon/rcd_ammo/large(src)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index b77f5bd6afe..a4620c24b00 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -1155,6 +1155,7 @@ var/global/list/g_fancy_list_of_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/captain(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/full(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(M), slot_in_backpack)
 
 			R.keyslot = new /obj/item/device/encryptionkey/heads/captain
 
@@ -1179,6 +1180,7 @@ var/global/list/g_fancy_list_of_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/handcuffs(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/full(M), slot_belt)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(M), slot_in_backpack)
 
 			R.keyslot = new /obj/item/device/encryptionkey/heads/hos
 
@@ -1202,6 +1204,7 @@ var/global/list/g_fancy_list_of_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/medical(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(M), slot_r_hand)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(M), slot_in_backpack)
 
 			R.keyslot = new /obj/item/device/encryptionkey/heads/cmo
 
@@ -1226,6 +1229,7 @@ var/global/list/g_fancy_list_of_types = null
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/weapon/rcd_ammo/large(M), slot_l_store)
+			M.equip_to_slot_or_del(new /obj/item/weapon/melee/baton/loaded(M), slot_in_backpack)
 
 			R.keyslot = new /obj/item/device/encryptionkey/heads/ce
 
@@ -1276,4 +1280,4 @@ var/global/list/g_fancy_list_of_types = null
 	W.assignment = "Centcom Official"
 	W.registered_name = M.real_name
 	W.update_label()
-	M.equip_to_slot_or_del(W, slot_wear_id)
+	M.equip_to_slot_or_del(W, slot_wear_id)