diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 1d9e02f52a1..e9e3a309da7 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -290,6 +290,11 @@
 					continue
 				O.loc = src
 
+	for(var/obj/machinery/computer/cloning/cloner in clonecomputers)
+		for(var/datum/dna2/record/R in cloner.records)
+			if(R.ckey == occupant.ckey)
+				cloner.records.Remove(R)
+
 	//Delete all items not on the preservation list.
 	var/list/items = src.contents
 	items -= occupant // Don't delete the occupant
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 756a13765fe..db6ef63ad22 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -174,10 +174,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		if(response != "Ghost")
 			return	//didn't want to ghost after-all
 		resting = 1
-		for(var/obj/machinery/computer/cloning/cloner in clonecomputers)
-			for(var/datum/dna2/record/R in cloner.records)
-				if(R.ckey == ckey)
-					cloner.records.Remove(R)
 		var/mob/dead/observer/ghost = ghostize(0)            //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
 		ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly.
 	var/obj/structure/morgue/Morgue = locate() in M.loc