diff --git a/code/modules/mob/living/bot/bot.dm b/code/modules/mob/living/bot/bot.dm
index e9ab9b665c9..2a9fcba5b4a 100644
--- a/code/modules/mob/living/bot/bot.dm
+++ b/code/modules/mob/living/bot/bot.dm
@@ -563,9 +563,7 @@
 	return ..()
 
 /mob/living/bot/Logout()
-	no_vore = TRUE // ROBOT VORE
 	release_vore_contents()
-	init_vore() // ROBOT VORE
 	verbs -= /mob/proc/insidePanel
 	no_vore = TRUE
 	devourable = FALSE
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index 0dcae0ea9f1..447bf1b260e 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -45,7 +45,7 @@
 /hook/living_new/proc/vore_setup(mob/living/M)
 	//Tries to load prefs if a client is present otherwise gives freebie stomach
 	spawn(2 SECONDS)
-		if(M)
+		if(!QDELETED(M))
 			M.init_vore()
 
 	//return TRUE to hook-caller
@@ -80,6 +80,11 @@
 				allow_spontaneous_tf = TRUE
 		return TRUE
 
+/mob/living/init_vore()
+	if(no_vore)
+		return FALSE
+	return ..()
+
 //
 // Hide vore organs in contents
 //