diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 20c1ffc74de..45c502d233d 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -106,5 +106,11 @@
 	return TRUE
 
 /obj/item/grenade/attack_hand()
+	///We need to clear the walk_to on grabbing a moving grenade to have it not leap straight out of your hand
 	walk(src, null, null)
 	..()
+
+/obj/item/grenade/Destroy()
+	///We need to clear the walk_to on destroy to allow a grenade which uses walk_to or related to properly GC
+	walk_to(src, 0)
+	return ..()