diff --git a/Content.Server/Research/Systems/ResearchSystem.Client.cs b/Content.Server/Research/Systems/ResearchSystem.Client.cs index 135ef8fe88..6bd5300d8f 100644 --- a/Content.Server/Research/Systems/ResearchSystem.Client.cs +++ b/Content.Server/Research/Systems/ResearchSystem.Client.cs @@ -82,12 +82,11 @@ public sealed partial class ResearchSystem if (!Resolve(uid, ref component, false)) return; - if (!TryGetClientServer(uid, out _, out var serverComponent, component)) - return; + TryGetClientServer(uid, out _, out var serverComponent, component); var names = GetServerNames(); var state = new ResearchClientBoundInterfaceState(names.Length, names, - GetServerIds(), component.ConnectedToServer ? serverComponent.Id : -1); + GetServerIds(), serverComponent?.Id ?? -1); _uiSystem.TrySetUiState(uid, ResearchClientUiKey.Key, state); }