diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 5f1c1cb7b77..e9f000eb3f2 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -620,6 +620,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return 1
mob/dead/observer/MayRespawn(var/feedback = 0)
+ if(!client || !mind)
+ return 0
+ if(mind.current && mind.current.stat != DEAD)
+ if(feedback)
+ src << "Your non-dead body prevent you from respawning."
+ return 0
if(config.antag_hud_restricted && has_enabled_antagHUD == 1)
if(feedback)
src << "antagHUD restrictions prevent you from respawning."