diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm index 86eecc8e41a..feb34bf041e 100644 --- a/code/modules/surgery/organs/internal/heart/_heart.dm +++ b/code/modules/surgery/organs/internal/heart/_heart.dm @@ -47,7 +47,7 @@ /obj/item/organ/heart/Remove(mob/living/carbon/heartless, special, movement_flags) . = ..() - if(!special) + if(!special && !QDELETED(src)) addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 12 SECONDS, TIMER_DELETE_ME) beat = BEAT_NONE owner?.stop_sound_channel(CHANNEL_HEARTBEAT)