diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index ab9c7ea4bf..2e4121e505 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -424,7 +424,8 @@ namespace Content.Server.GameTicking #endif // TODO: Maybe something less naive here? // FIXME: Actually, definitely. - EntityManager.DeleteEntity(entity); + if (!Deleted(entity) && !Terminating(entity)) + EntityManager.DeleteEntity(entity); #if EXCEPTION_TOLERANCE } catch (Exception e)