diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm
index a6efdd097c1..c7165264527 100644
--- a/code/datums/status_effects/status_effect.dm
+++ b/code/datums/status_effects/status_effect.dm
@@ -38,6 +38,7 @@
 /datum/status_effect/Destroy()
 	STOP_PROCESSING(SSfastprocess, src)
 	if(owner)
+		linked_alert = null
 		owner.clear_alert(id)
 		LAZYREMOVE(owner.status_effects, src)
 		on_remove()
@@ -89,6 +90,10 @@
 	desc = "You don't feel any different..."
 	var/datum/status_effect/attached_effect
 
+/atom/movable/screen/alert/status_effect/Destroy()
+	attached_effect = null //Don't keep a ref now
+	return ..()
+
 //////////////////
 // HELPER PROCS //
 //////////////////