diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index 25b5cf2f86..5d71a00420 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -20,6 +20,11 @@
 	holstered.add_fingerprint(user)
 	w_class = max(w_class, holstered.w_class)
 	user.visible_message("<span class='notice'>[user] holsters \the [holstered].</span>", "<span class='notice'>You holster \the [holstered].</span>")
+	name = "occupied [initial(name)]"
+
+/obj/item/clothing/accessory/holster/proc/clear_holster()
+	holstered = null
+	name = initial(name)
 
 /obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob)
 	if(!holstered)
@@ -40,8 +45,8 @@
 				)
 		user.put_in_hands(holstered)
 		holstered.add_fingerprint(user)
-		holstered = null
 		w_class = initial(w_class)
+		clear_holster()
 
 /obj/item/clothing/accessory/holster/attack_hand(mob/user as mob)
 	if (has_suit)	//if we are part of a suit