diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index db4cba35cb0..70d1c425e49 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -81,6 +81,18 @@
 /obj/item/melee/baton/get_cell()
 	return cell
 
+/obj/item/melee/baton/mob_can_equip(mob/user, slot, disable_warning = TRUE)
+	if(turned_on && (slot == slot_belt || slot == slot_s_store))
+		to_chat(user, "<span class='warning'>You can't equip [src] while it's active!</span>")
+		return FALSE
+	return ..(user, slot, disable_warning = TRUE) // call parent but disable warning
+
+/obj/item/melee/baton/can_enter_storage(obj/item/storage/S, mob/user)
+	if(turned_on)
+		to_chat(user, "<span class='warning'>[S] can't hold [src] while it's active!</span>")
+		return FALSE
+	return TRUE
+
 /**
   * Removes the specified amount of charge from the batons power cell.
   *