diff --git a/src/Identity/Startup.cs b/src/Identity/Startup.cs
index 46dffc0b87..e1fb6c5b45 100644
--- a/src/Identity/Startup.cs
+++ b/src/Identity/Startup.cs
@@ -144,6 +144,12 @@ namespace Bit.Identity
 
             app.UseSerilog(env, appLifetime, globalSettings);
 
+            if (globalSettings.SelfHosted)
+            {
+                app.UsePathBase("/identity");
+                app.UseForwardedHeaders(globalSettings);
+            }
+
             // Default Middleware
             app.UseDefaultMiddleware(env, globalSettings);
 
@@ -152,10 +158,6 @@ namespace Bit.Identity
                 // Rate limiting
                 app.UseMiddleware<CustomIpRateLimitMiddleware>();
             }
-            else
-            {
-                app.UseForwardedHeaders(globalSettings);
-            }
 
             if (env.IsDevelopment())
             {