diff --git a/pkg/apiserver/watch.go b/pkg/apiserver/watch.go
index 32e1989a132..3519e729079 100644
--- a/pkg/apiserver/watch.go
+++ b/pkg/apiserver/watch.go
@@ -88,6 +88,7 @@ type WatchServer struct {
 
 // HandleWS implements a websocket handler.
 func (w *WatchServer) HandleWS(ws *websocket.Conn) {
+	defer ws.Close()
 	done := make(chan struct{})
 	go func() {
 		var unused interface{}