diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 0c4450881e..2a68cb87f7 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -65,9 +65,10 @@
 /obj/item/Destroy()
 	if(ismob(loc))
 		var/mob/m = loc
-		m.unEquip(src, 1)
+		m.drop_from_inventory(src)
 		m.update_inv_r_hand()
 		m.update_inv_l_hand()
+		src.loc = null
 	return ..()
 
 /obj/item/device
@@ -604,4 +605,4 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 
 
 /obj/item/proc/pwr_drain()
-	return 0 // Process Kill
+	return 0 // Process Kill