diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index 3b9104b80e..d87925534a 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -19,6 +19,7 @@
 	user.drop_from_inventory(holstered)
 	holstered.loc = src
 	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>")
 
 /obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob)
@@ -41,6 +42,7 @@
 		user.put_in_hands(holstered)
 		holstered.add_fingerprint(user)
 		holstered = null
+		w_class = initial(w_class)
 
 /obj/item/clothing/accessory/holster/attack_hand(mob/user as mob)
 	if (has_suit)	//if we are part of a suit