diff --git a/server/server.go b/server/server.go
index 7d6e85ed5f..de492e5870 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"bufio"
 	"context"
 	"crypto/rsa"
 	"encoding/json"
@@ -363,7 +364,19 @@ func newServer(ctx context.Context, c Config, rotationStrategy rotationStrategy)
 		})
 	}
 
+	// Buffer size middleware
+        bufferSizeMidldleware := func(next http.Handler) http.Handler {
+                return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+                        w := bufio.NewWriterSize(w, 4096*2)
+                        if w.Buffered() > 0 {
+                                w.Flush()
+                        }
+                        next.ServeHTTP(w, r)
+                })
+        }
+
 	r := mux.NewRouter().SkipClean(true).UseEncodedPath()
+        r.Use(bufferSizeMidldleware)
 	r.Use(frameAncestorsMidldleware)
 	handle := func(p string, h http.Handler) {
 		r.Handle(path.Join(issuerURL.Path, p), instrumentHandlerCounter(p, h))