diff --git a/src/Admin/Startup.cs b/src/Admin/Startup.cs
index f0dbfbd370..eba2d59c8a 100644
--- a/src/Admin/Startup.cs
+++ b/src/Admin/Startup.cs
@@ -64,16 +64,16 @@ namespace Bit.Admin
         {
             loggerFactory.AddSerilog(app, env, appLifetime, globalSettings, (e) => e.Level >= LogEventLevel.Error);
 
-            if(env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
             if(globalSettings.SelfHosted)
             {
                 app.UsePathBase("/admin");
             }
 
+            if(env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
             app.UseAuthentication();
             app.UseStaticFiles();
             app.UseMvcWithDefaultRoute();
diff --git a/util/Setup/NginxConfigBuilder.cs b/util/Setup/NginxConfigBuilder.cs
index 4d22be94bd..166b01330f 100644
--- a/util/Setup/NginxConfigBuilder.cs
+++ b/util/Setup/NginxConfigBuilder.cs
@@ -195,7 +195,7 @@ server {{
   }}
 
   location /admin/ {{
-    proxy_pass http://admin:5000/;
+    proxy_pass http://admin:5000/admin/;
   }}
 }}");
             }