diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index fcd22e8b..d162e62c 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -68,9 +68,6 @@ namespace Oqtane
             services.AddOptions<List<Database>>().Bind(Configuration.GetSection(SettingKeys.AvailableDatabasesSection));
             services.Configure<HostOptions>(opts => opts.ShutdownTimeout = TimeSpan.FromSeconds(10)); // increase from default of 5 seconds
 
-            // setup HttpClient for server side in a client side compatible fashion ( with auth cookie )
-            services.AddHttpClients();
-
             // register scoped core services
             services.AddScoped<IAuthorizationHandler, PermissionHandler>()
                 .AddOqtaneScopedServices()
@@ -78,6 +75,9 @@ namespace Oqtane
 
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
+            // setup HttpClient for server side in a client side compatible fashion ( with auth cookie )
+            services.AddHttpClients();
+
             // register singleton scoped core services
             services.AddSingleton(Configuration)
                 .AddOqtaneSingletonServices();
@@ -199,7 +199,6 @@ namespace Oqtane
             app.UseStaticFiles();
             app.UseTenantResolution();
             app.UseJwtAuthorization();
-            app.UseBlazorFrameworkFiles();
             app.UseRouting();
             app.UseCors();
             app.UseAuthentication();