diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs
index 2e20cbf..8e41306 100644
--- a/MareSynchronosServer/MareSynchronosServer/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs
@@ -108,9 +108,6 @@ namespace MareSynchronosServer
                 options.EnableThreadSafetyChecks(false);
             }, mareConfig.GetValue("DbContextPoolSize", 1024));
 
-            
-            services.AddHostedService(provider => provider.GetService<SystemInfoService>());
-
             services.AddAuthentication(options =>
             {
                 options.DefaultScheme = SecretKeyGrpcAuthenticationHandler.AuthScheme;
@@ -143,13 +140,15 @@ namespace MareSynchronosServer
                     opt.InstanceName = "MareSynchronos";
                 });
                 services.AddSingleton<IClientIdentificationService, DistributedClientIdentificationService>();
-                services.AddHostedService(p => p.GetService<DistributedClientIdentificationService>());
+                services.AddHostedService(p => p.GetService<IClientIdentificationService>());
             }
             else
             {
                 services.AddSingleton<IClientIdentificationService, LocalClientIdentificationService>();
-                services.AddHostedService(p => p.GetService<LocalClientIdentificationService>());
+                services.AddHostedService(p => p.GetService<IClientIdentificationService>());
             }
+
+            services.AddHostedService(provider => provider.GetService<SystemInfoService>());
         }
 
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
diff --git a/MareSynchronosServer/MareSynchronosServices/Startup.cs b/MareSynchronosServer/MareSynchronosServices/Startup.cs
index e7914e7..bb3eb81 100644
--- a/MareSynchronosServer/MareSynchronosServices/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosServices/Startup.cs
@@ -61,12 +61,12 @@ public class Startup
                 opt.InstanceName = "MareSynchronos";
             });
             services.AddSingleton<IClientIdentificationService, DistributedClientIdentificationService>();
-            services.AddHostedService(p => p.GetService<DistributedClientIdentificationService>());
+            services.AddHostedService(p => p.GetService<IClientIdentificationService>());
         }
         else
         {
             services.AddSingleton<IClientIdentificationService, LocalClientIdentificationService>();
-            services.AddHostedService(p => p.GetService<LocalClientIdentificationService>());
+            services.AddHostedService(p => p.GetService<IClientIdentificationService>());
         }
     }