diff --git a/Content.Server/Research/Systems/ResearchSystem.cs b/Content.Server/Research/Systems/ResearchSystem.cs index 2d21737f84..603a003641 100644 --- a/Content.Server/Research/Systems/ResearchSystem.cs +++ b/Content.Server/Research/Systems/ResearchSystem.cs @@ -27,7 +27,9 @@ namespace Content.Server.Research.Systems private void OnStartup(EntityUid uid, ResearchServerComponent component, ComponentStartup args) { - component.Id = EntityQuery(true).Count(); + var unusedId = EntityQuery(true) + .Max(s => s.Id) + 1; + component.Id = unusedId; } public ResearchServerComponent? GetServerById(int id)