diff --git a/MareSynchronosServer/MareSynchronosServer/Services/GrpcClientIdentificationService.cs b/MareSynchronosServer/MareSynchronosServer/Services/GrpcClientIdentificationService.cs
index 9ffab32..f6bfe9f 100644
--- a/MareSynchronosServer/MareSynchronosServer/Services/GrpcClientIdentificationService.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Services/GrpcClientIdentificationService.cs
@@ -191,6 +191,7 @@ public class GrpcClientIdentificationService : IHostedService
         try
         {
             using var stream = grpcIdentClientStreamOut.SendStreamIdentStatusChange(cancellationToken: cts);
+            _logger.LogInformation("Starting Send Online Client Data stream");
             await stream.RequestStream.WriteAsync(new IdentChangeMessage()
             {
                 Server = new ServerMessage()
@@ -226,6 +227,7 @@ public class GrpcClientIdentificationService : IHostedService
             {
                 ServerId = _shardName,
             });
+            _logger.LogInformation("Starting Receive Online Client Data stream");
             await foreach (var cur in stream.ResponseStream.ReadAllAsync(cts).ConfigureAwait(false))
             {
                 if (cur.IsOnline)
diff --git a/MareSynchronosServer/MareSynchronosServices/Identity/IdentityService.cs b/MareSynchronosServer/MareSynchronosServices/Identity/IdentityService.cs
index 7477139..f1e4a15 100644
--- a/MareSynchronosServer/MareSynchronosServices/Identity/IdentityService.cs
+++ b/MareSynchronosServer/MareSynchronosServices/Identity/IdentityService.cs
@@ -105,13 +105,20 @@ internal class IdentityService : IdentificationService.IdentificationServiceBase
         {
             while (!context.CancellationToken.IsCancellationRequested)
             {
-                while (identChanges.ContainsKey(server) && identChanges[server].TryDequeue(out var cur))
+                if (identChanges.ContainsKey(server))
                 {
-                    _logger.LogInformation("Sending " + cur.UidWithIdent.Uid.Uid + " to " + server);
-                    await responseStream.WriteAsync(cur).ConfigureAwait(false);
+                    if (identChanges[server].TryDequeue(out var cur))
+                    {
+                        _logger.LogInformation("Sending " + cur.UidWithIdent.Uid.Uid + " to " + server);
+                        await responseStream.WriteAsync(cur).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        _logger.LogInformation("Nothing to send to " + server);
+                    }
                 }
 
-                await Task.Delay(10).ConfigureAwait(false);
+                await Task.Delay(250).ConfigureAwait(false);
             }
         }
         catch