diff --git a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index a3684f89c..25e135566 100644
--- a/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/src/FilterLists.Api/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -11,7 +11,6 @@ public static class ConfigureServicesCollection
         public static void AddFilterListsApi(this IServiceCollection services)
         {
             services.AddRouting(options => options.LowercaseUrls = true);
-            services.AddMvcCore();
             services.AddApiVersioning();
             services.AddSwaggerGenCustom();
             TelemetryDebugWriter.IsTracingDisabled = true;
diff --git a/src/FilterLists.Api/Program.cs b/src/FilterLists.Api/Program.cs
index 7b21ee29d..5b2dc3950 100644
--- a/src/FilterLists.Api/Program.cs
+++ b/src/FilterLists.Api/Program.cs
@@ -11,7 +11,7 @@ public static void Main(string[] args)
         }
 
         private static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args)
-                                                                                     .UseUrls("http://localhost:5000;")
+                                                                                     .UseUrls("http://localhost:5000")
                                                                                      .UseApplicationInsights()
                                                                                      .UseStartup<Startup>();
     }
diff --git a/src/FilterLists.Api/Startup.cs b/src/FilterLists.Api/Startup.cs
index 89497fdf5..dcced5684 100644
--- a/src/FilterLists.Api/Startup.cs
+++ b/src/FilterLists.Api/Startup.cs
@@ -40,25 +40,14 @@ public void ConfigureServices(IServiceCollection services)
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
-            app.UseSwagger(UseLowercaseControllerNameInSwaggerHack);
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
-                app.UseSwaggerUI(c =>
-                {
-                    c.SwaggerEndpoint("/swagger/v1/swagger.json", "FilterLists API V1");
-                    c.RoutePrefix = "docs";
-                });
             }
             else
             {
                 app.UseExceptionHandler("/Error");
                 app.UseHsts();
-                app.UseSwaggerUI(c =>
-                {
-                    c.SwaggerEndpoint("/api/swagger/v1/swagger.json", "FilterLists API V1");
-                    c.RoutePrefix = "docs";
-                });
             }
 
             app.UseForwardedHeaders(new ForwardedHeadersOptions
@@ -69,6 +58,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             app.UseStaticFiles();
             app.UseCookiePolicy();
             app.UseMvc();
+            app.UseSwagger(UseLowercaseControllerNameInSwaggerHack);
+            app.UseSwaggerUI(c =>
+            {
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", "FilterLists API V1");
+                c.RoutePrefix = "docs";
+                c.DocumentTitle = "FilterLists API";
+            });
             MigrateAndSeedDatabase(app);
         }