diff --git a/Content.Server/Shuttles/EntitySystems/DockingSystem.cs b/Content.Server/Shuttles/EntitySystems/DockingSystem.cs index c78efbb3a4..6fcfdaae4d 100644 --- a/Content.Server/Shuttles/EntitySystems/DockingSystem.cs +++ b/Content.Server/Shuttles/EntitySystems/DockingSystem.cs @@ -261,8 +261,9 @@ namespace Content.Server.Shuttles.EntitySystems private void OnPowerChange(EntityUid uid, DockingComponent component, PowerChangedEvent args) { + var lifestage = MetaData(uid).EntityLifeStage; // This is because power can change during startup for and undock - if (MetaData(uid).EntityLifeStage < EntityLifeStage.MapInitialized) return; + if (lifestage is < EntityLifeStage.MapInitialized or >= EntityLifeStage.Terminating) return; if (args.Powered) {