diff --git a/DiunaBI.UI.Shared/Extensions/ServiceCollectionExtensions.cs b/DiunaBI.UI.Shared/Extensions/ServiceCollectionExtensions.cs
index 01f5c4b..87f58fa 100644
--- a/DiunaBI.UI.Shared/Extensions/ServiceCollectionExtensions.cs
+++ b/DiunaBI.UI.Shared/Extensions/ServiceCollectionExtensions.cs
@@ -39,6 +39,7 @@ public static class ServiceCollectionExtensions
         });
 
         // Services
+        services.AddScoped<TokenProvider>();
         services.AddScoped<AuthService>();
         services.AddScoped<LayerService>();
         services.AddScoped<DataInboxService>();
@@ -48,11 +49,9 @@ public static class ServiceCollectionExtensions
         services.AddScoped<LayerFilterStateService>();
         services.AddScoped<DataInboxFilterStateService>();
 
-        // SignalR Hub Service (singleton for global connection shared across all users)
-        services.AddSingleton<EntityChangeHubService>(sp =>
+        // SignalR Hub Service (scoped per user session for authenticated connections)
+        services.AddScoped(sp =>
         {
-            // For singleton, we can't inject scoped services directly
-            // We'll get them from the service provider when needed
             var logger = sp.GetRequiredService<ILogger<EntityChangeHubService>>();
             var tokenProvider = sp.GetRequiredService<TokenProvider>();
             return new EntityChangeHubService(apiBaseUrl, sp, logger, tokenProvider);