diff --git a/nginx/defaults/main.yml b/nginx/defaults/main.yml
index b9732cc1..ab5514c6 100644
--- a/nginx/defaults/main.yml
+++ b/nginx/defaults/main.yml
@@ -25,6 +25,8 @@ nginx_multi_accept: 'off'
 nginx_worker_rlimit_nofile: 2048
 nginx_server_tokens: 'off'
 
+nginx_large_client_header_buffers: 4 8k
+
 nginx_enable_compression: True
 nginx_gzip_vary: "on"
 nginx_gzip_proxied: any
diff --git a/nginx/templates/nginx.conf.j2 b/nginx/templates/nginx.conf.j2
index ae69f9ba..9dccd9f9 100644
--- a/nginx/templates/nginx.conf.j2
+++ b/nginx/templates/nginx.conf.j2
@@ -19,6 +19,7 @@ http {
     # server_name_in_redirect off;
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
+    large_client_header_buffers {{ nginx_large_client_header_buffers }};
     ##
     # Logging Settings
     ##