diff --git a/puppet/zulip/manifests/app_frontend_base.pp b/puppet/zulip/manifests/app_frontend_base.pp
index a071dc2297..2f726ec16f 100644
--- a/puppet/zulip/manifests/app_frontend_base.pp
+++ b/puppet/zulip/manifests/app_frontend_base.pp
@@ -89,6 +89,7 @@ class zulip::app_frontend_base {
     notify  => Service[$zulip::common::supervisor_service],
   }
 
+  $uwsgi_buffer_size = zulipconf('application_server', 'uwsgi_buffer_size', 8192)
   $uwsgi_processes = zulipconf('application_server', 'uwsgi_processes', $uwsgi_default_processes)
   file { '/etc/zulip/uwsgi.ini':
     ensure  => file,
diff --git a/puppet/zulip/templates/uwsgi.ini.template.erb b/puppet/zulip/templates/uwsgi.ini.template.erb
index 368dc5d8b6..6669795822 100644
--- a/puppet/zulip/templates/uwsgi.ini.template.erb
+++ b/puppet/zulip/templates/uwsgi.ini.template.erb
@@ -7,7 +7,7 @@ chmod-socket=700
 chown-socket=zulip:zulip
 processes=<%= @uwsgi_processes %>
 harakiri=20
-buffer-size=8192
+buffer-size=<%= @uwsgi_buffer_size %>
 post-buffering=4096
 env= LANG=en_US.UTF-8
 uid=zulip