diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs index e77483bd3e..e49edb3262 100644 --- a/Content.Client/Light/RgbLightControllerSystem.cs +++ b/Content.Client/Light/RgbLightControllerSystem.cs @@ -41,6 +41,9 @@ namespace Content.Client.Light private void OnComponentShutdown(EntityUid uid, RgbLightControllerComponent rgb, ComponentShutdown args) { + if (LifeStage(uid) >= EntityLifeStage.Terminating) + return; + ResetOriginalColors(uid, rgb); // and reset any in-hands or clothing sprites