diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index c545b323c0..2f7e082214 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -18,6 +18,7 @@ using IdentityModel;
 using IdentityServer4.AccessTokenValidation;
 using jsreport.AspNetCore;
 using Bit.Core.IdentityServer;
+using Microsoft.AspNetCore.HttpOverrides;
 
 namespace Bit.Api
 {
@@ -173,6 +174,13 @@ namespace Bit.Api
                 // Rate limiting
                 app.UseMiddleware<CustomIpRateLimitMiddleware>();
             }
+            else
+            {
+                app.UseForwardedHeaders(new ForwardedHeadersOptions
+                {
+                    ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+                });
+            }
 
             // Add static files to the request pipeline.
             app.UseStaticFiles();