diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index ab4847275f7..f67178e1e67 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -86,6 +86,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 		var/mob/m = loc
 		m.unEquip(src, 1)
 	QDEL_LIST(actions)
+	master = null
 	return ..()
 
 /obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index 65fab5cbbe0..12dd3b7585e 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -1,12 +1,11 @@
 /obj/item/weapon/grenade/empgrenade
-	name = "classic emp grenade"
+	name = "classic EMP grenade"
+	desc = "It is designed to wreak havoc on electronic systems."
 	icon_state = "emp"
 	item_state = "emp"
 	origin_tech = "materials=2;magnets=3"
 
-	prime()
-		..()
-		if(empulse(src, 4, 10))
-			qdel(src)
-		return
-
+/obj/item/weapon/grenade/empgrenade/prime()
+	update_mob()
+	empulse(src, 4, 10)
+	qdel(src)
\ No newline at end of file