diff --git a/httpd/handler.go b/httpd/handler.go
index aa4b159bb9..d7a403e9aa 100644
--- a/httpd/handler.go
+++ b/httpd/handler.go
@@ -277,6 +277,7 @@ func (h *Handler) serveWait(w http.ResponseWriter, r *http.Request) {
 
 	if index == 0 {
 		w.WriteHeader(http.StatusBadRequest)
+		return
 	}
 
 	var d time.Duration