diff --git a/src/NzbDrone.Host/Startup.cs b/src/NzbDrone.Host/Startup.cs
index db16411d5c..d9fb4c8098 100644
--- a/src/NzbDrone.Host/Startup.cs
+++ b/src/NzbDrone.Host/Startup.cs
@@ -61,6 +61,11 @@ public void ConfigureServices(IServiceCollection services)
                 options.KnownProxies.Clear();
             });
 
+            services.Configure<CookiePolicyOptions>(options =>
+            {
+                options.Secure = CookieSecurePolicy.Always;
+            });
+
             services.AddRouting(options => options.LowercaseUrls = true);
 
             services.AddResponseCompression(options => options.EnableForHttps = true);
@@ -252,11 +257,6 @@ public void Configure(IApplicationBuilder app,
             }
 
             app.UseForwardedHeaders();
-            app.UseCookiePolicy(new CookiePolicyOptions
-            {
-                Secure = CookieSecurePolicy.Always,
-                MinimumSameSitePolicy = SameSiteMode.None
-            });
             app.UseMiddleware<LoggingMiddleware>();
             app.UsePathBase(new PathString(configFileProvider.UrlBase));
             app.UseExceptionHandler(new ExceptionHandlerOptions
@@ -265,6 +265,7 @@ public void Configure(IApplicationBuilder app,
                 ExceptionHandler = errorHandler.HandleException
             });
 
+            app.UseCookiePolicy();
             app.UseRouting();
             app.UseCors();
             app.UseAuthentication();