diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs index d5a17bf19c..5a7e6bb994 100644 --- a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs @@ -70,7 +70,8 @@ namespace Content.Server.GameObjects.EntitySystems.AI foreach (var message in _queuedMobStateMessages) { - if (!message.Entity.TryGetComponent(out AiControllerComponent? controller)) + if (message.Entity.Deleted || + !message.Entity.TryGetComponent(out AiControllerComponent? controller)) { continue; }