diff --git a/Content.Server/Research/Systems/ResearchSystem.Client.cs b/Content.Server/Research/Systems/ResearchSystem.Client.cs
index 6182adeb85f..87923014d58 100644
--- a/Content.Server/Research/Systems/ResearchSystem.Client.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.Client.cs
@@ -60,7 +60,10 @@ private void OnClientMapInit(EntityUid uid, ResearchClientComponent component, M
     {
         var allServers = EntityQuery<ResearchServerComponent>(true).ToArray();
         if (allServers.Length > 0)
+        {
             RegisterClient(uid, allServers[0].Owner, component, allServers[0]);
+            UnregisterClient(uid, component); // Unrigister a new computer from servers, this is need right after to make sure it didnt register unser someone else server.
+        }
     }
 
     private void OnClientShutdown(EntityUid uid, ResearchClientComponent component, ComponentShutdown args)