diff --git a/config/deploy/nginx-configmap.yaml.erb b/config/deploy/nginx-configmap.yaml.erb
index 33b9e81f0be..308835c7a0d 100644
--- a/config/deploy/nginx-configmap.yaml.erb
+++ b/config/deploy/nginx-configmap.yaml.erb
@@ -10,6 +10,10 @@ data:
       worker_connections  5120;
     }
     http {
+      # Ensure buffer is large enough to contend with a redirect to a URL that is at the request line length limit
+      proxy_buffers   4 16k;
+      proxy_buffer_size 16k;
+
       server {
           listen       80;
           server_name  _;