diff --git a/server/internal/registry/server.go b/server/internal/registry/server.go
index af26fe1d5..f62a622a9 100644
--- a/server/internal/registry/server.go
+++ b/server/internal/registry/server.go
@@ -73,8 +73,13 @@ type statusCodeRecorder struct {
 func (r *statusCodeRecorder) WriteHeader(status int) {
 	if r._status == 0 {
 		r._status = status
+		r.ResponseWriter.WriteHeader(status)
 	}
-	r.ResponseWriter.WriteHeader(status)
+}
+
+func (r *statusCodeRecorder) Write(b []byte) (int, error) {
+	r._status = r.status()
+	return r.ResponseWriter.Write(b)
 }
 
 var (