diff --git a/workhorse/internal/senddata/senddata.go b/workhorse/internal/senddata/senddata.go
index 764aec1e558309d509348f86a2a472dd719480b7..f0d1da021799dd7d115343a24dd8c67e38ac172a 100644
--- a/workhorse/internal/senddata/senddata.go
+++ b/workhorse/internal/senddata/senddata.go
@@ -44,7 +44,7 @@ func SendData(h http.Handler, injecters ...Injecter) http.Handler {
 			req:       r,
 			injecters: injecters,
 		}
-		defer s.Flush()
+		defer s.flush()
 		h.ServeHTTP(&s, r)
 	}))
 }
@@ -101,7 +101,11 @@ func (s *sendDataResponseWriter) tryInject() bool {
 	return false
 }
 
-func (s *sendDataResponseWriter) Flush() {
+func (s *sendDataResponseWriter) flush() {
 	s.WriteHeader(http.StatusOK)
-	http.NewResponseController(s.rw).Flush()
+}
+
+// Unwrap lets http.ResponseController get the underlying http.ResponseWriter.
+func (s *sendDataResponseWriter) Unwrap() http.ResponseWriter {
+	return s.rw
 }