diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index 2e177c8ff3..781a76f20f 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -74,7 +74,7 @@ /datum/component/Destroy(force=FALSE, silent=FALSE) if(!force && parent) _RemoveFromParent() - if(!silent) + if(parent && !silent) //CHOMPEdit SEND_SIGNAL(parent, COMSIG_COMPONENT_REMOVING, src) parent = null return ..()