diff --git a/pkg/apiserver/watch.go b/pkg/apiserver/watch.go
index b62693822f7..81bc6acfdf9 100644
--- a/pkg/apiserver/watch.go
+++ b/pkg/apiserver/watch.go
@@ -203,7 +203,9 @@ func (s *WatchServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 				// client disconnect.
 				return
 			}
-			flusher.Flush()
+			if len(ch) == 0 {
+				flusher.Flush()
+			}
 
 			buf.Reset()
 		}