diff --git a/code/modules/mob/living/basic/farm_animals/goat/_goat.dm b/code/modules/mob/living/basic/farm_animals/goat/_goat.dm
index 34b92f21882..f2354cc5f14 100644
--- a/code/modules/mob/living/basic/farm_animals/goat/_goat.dm
+++ b/code/modules/mob/living/basic/farm_animals/goat/_goat.dm
@@ -100,7 +100,7 @@
 /// Handles automagically eating a plant when we move into a turf that has one.
 /mob/living/basic/goat/proc/on_move(datum/source, atom/entering_loc)
 	SIGNAL_HANDLER
-	if(!isturf(entering_loc))
+	if(!isturf(entering_loc) || stat == DEAD)
 		return
 
 	var/list/edible_plants = list()