diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm
index fc26b143b91..6fb548eb4ff 100644
--- a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm
+++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_component.dm
@@ -230,7 +230,10 @@ GLOBAL_LIST_EMPTY(soulcatchers)
 
 	current_souls -= soul_to_remove
 	soul_to_remove.current_room = null
+
+	soul_to_remove.return_to_body()
 	qdel(soul_to_remove)
+
 	return TRUE
 
 /// Transfers a soul from a soulcatcher room to another soulcatcher room. Returns `FALSE` if the target room or target soul cannot be found.
diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_mob.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_mob.dm
index 7f2acf6ddde..fefaf69c25e 100644
--- a/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_mob.dm
+++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/soulcatcher_mob.dm
@@ -97,10 +97,12 @@
 	if(tgui_alert(src, "Are you really sure about this?", "Soulcatcher", list("Yes", "No")) != "Yes")
 		return FALSE
 
+	return_to_body()
 	qdel(src)
 
 /mob/living/soulcatcher_soul/ghost()
 	. = ..()
+	return_to_body()
 	qdel(src)
 
 /mob/living/soulcatcher_soul/say(message, bubble_type, list/spans, sanitize, datum/language/language, ignore_spam, forced, filterproof, message_range, datum/saymode/saymode)
@@ -155,6 +157,21 @@
 	set hidden = TRUE
 	return FALSE
 
+/// Assuming we have a previous body a present mind on our soul, we are going to transfer the mind back to the old body.
+/mob/living/soulcatcher_soul/proc/return_to_body()
+	if(!previous_body || !mind)
+		return FALSE
+
+	var/mob/target_body = previous_body.resolve()
+	if(!target_body)
+		return FALSE
+
+	mind.transfer_to(target_body)
+	SEND_SIGNAL(target_body, COMSIG_SOULCATCHER_CHECK_SOUL, FALSE)
+
+	if(target_body.stat != DEAD)
+		target_body.grab_ghost(TRUE)
+
 /mob/living/soulcatcher_soul/Destroy()
 	log_message("[key_name(src)] has exited a soulcatcher.", LOG_GAME)
 	if(current_room)
@@ -164,17 +181,6 @@
 
 		current_room = null
 
-	if(previous_body && mind)
-		var/mob/target_body = previous_body.resolve()
-		if(!target_body)
-			return FALSE
-
-		mind.transfer_to(target_body)
-		SEND_SIGNAL(target_body, COMSIG_SOULCATCHER_CHECK_SOUL, FALSE)
-
-		if(target_body.stat != DEAD)
-			target_body.grab_ghost(TRUE)
-
 	return ..()
 
 /datum/emote/living