diff --git a/mokey.toml.sample b/mokey.toml.sample
index 73e44673..39d3d2ef 100644
--- a/mokey.toml.sample
+++ b/mokey.toml.sample
@@ -146,6 +146,10 @@ listen = "0.0.0.0:8866"
 # Times out the session after inactivity (in seconds)
 session_idle_timeout = 900
 
+# Max size in bytes of the request headers (increase if clients send large
+# cookies and requests fail with 431 Request Header Fields Too Large)
+# read_buffer_size = 16384
+
 # Path to ssl certificate
 # ssl_cert = ""
 
diff --git a/server/server.go b/server/server.go
index 35eca2e1..21e897fd 100644
--- a/server/server.go
+++ b/server/server.go
@@ -62,6 +62,7 @@ func SetDefaults() {
 	viper.SetDefault("server.idle_timeout", 120)
 	viper.SetDefault("server.rate_limit_expiration", 3600)
 	viper.SetDefault("server.rate_limit_max", 10)
+	viper.SetDefault("server.read_buffer_size", 16384)
 	viper.SetDefault("storage.driver", "memory")
 }
 
@@ -145,6 +146,7 @@ func newFiber() (*fiber.App, error) {
 		ReadTimeout:           time.Duration(viper.GetInt("server.read_timeout")) * time.Second,
 		WriteTimeout:          time.Duration(viper.GetInt("server.write_timeout")) * time.Second,
 		IdleTimeout:           time.Duration(viper.GetInt("server.idle_timeout")) * time.Second,
+		ReadBufferSize:        viper.GetInt("server.read_buffer_size"),
 		AppName:               "mokey",
 		DisableStartupMessage: true,
 		PassLocalsToViews:     true,