diff --git a/Pkmds.Web/Components/Pages/Home.razor.cs b/Pkmds.Web/Components/Pages/Home.razor.cs
index de7922ae..2065b630 100644
--- a/Pkmds.Web/Components/Pages/Home.razor.cs
+++ b/Pkmds.Web/Components/Pages/Home.razor.cs
@@ -10,7 +10,11 @@ protected override void OnInitialized()
         RefreshService.OnUpdateAvailable += ShowUpdateMessage;
     }
 
-    public void Dispose() => RefreshService.OnAppStateChanged -= StateHasChanged;
+    public void Dispose()
+    {
+        RefreshService.OnAppStateChanged -= StateHasChanged;
+        RefreshService.OnUpdateAvailable -= ShowUpdateMessage;
+    }
 
     public void ShowUpdateMessage()
     {
diff --git a/Pkmds.Web/Program.cs b/Pkmds.Web/Program.cs
index 8c48c829..986c15b9 100644
--- a/Pkmds.Web/Program.cs
+++ b/Pkmds.Web/Program.cs
@@ -12,14 +12,14 @@
     });
 
 services
-    .AddScoped(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) })
+    .AddSingleton(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) })
     .AddFileSystemAccessService()
-    .AddScoped<IAppState, AppState>()
-    .AddScoped<IRefreshService, RefreshService>()
-    .AddScoped<IAppService, AppService>()
-    .AddScoped<JsService>()
-    .AddScoped<BlazorAesProvider>()
-    .AddScoped<BlazorMd5Provider>();
+    .AddSingleton<IAppState, AppState>()
+    .AddSingleton<IRefreshService, RefreshService>()
+    .AddSingleton<IAppService, AppService>()
+    .AddSingleton<JsService>()
+    .AddSingleton<BlazorAesProvider>()
+    .AddSingleton<BlazorMd5Provider>();
 
 var app = builder.Build();