diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs index c84d28b450..436149f076 100644 --- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs +++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs @@ -22,7 +22,7 @@ public sealed class HeadsetSystem : SharedHeadsetSystem SubscribeLocalEvent(OnKeysChanged); SubscribeLocalEvent(OnSpeak); - + SubscribeLocalEvent(OnEmpPulse); } @@ -33,7 +33,8 @@ public sealed class HeadsetSystem : SharedHeadsetSystem private void UpdateRadioChannels(EntityUid uid, HeadsetComponent headset, EncryptionKeyHolderComponent? keyHolder = null) { - if (!headset.Enabled) + // make sure to not add ActiveRadioComponent when headset is being deleted + if (!headset.Enabled || MetaData(uid).EntityLifeStage >= EntityLifeStage.Terminating) return; if (!Resolve(uid, ref keyHolder))