diff --git a/code/modules/multiz/zshadow.dm b/code/modules/multiz/zshadow.dm
index 7a04768ae7..ca81e66f1a 100644
--- a/code/modules/multiz/zshadow.dm
+++ b/code/modules/multiz/zshadow.dm
@@ -24,6 +24,7 @@
 	sync_icon(L)
 
 /mob/zshadow/Destroy()
+	owner.shadow = null
 	owner = null
 	..() //But we don't return because the hint is wrong
 	return QDEL_HINT_QUEUE
diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm
index 7d875cc885..6b657f4d4b 100644
--- a/code/modules/turbolift/turbolift.dm
+++ b/code/modules/turbolift/turbolift.dm
@@ -97,6 +97,8 @@
 			if(istype(AM, /mob/living))
 				var/mob/living/M = AM
 				M.gib()
+			else if(istype(AM, /mob/zshadow))
+				AM.Destroy()		//prevent deleting shadow without deleting shadow's shadows
 			else if(AM.simulated && !(istype(AM, /mob/observer)))
 				qdel(AM)