diff --git a/api/queue.go b/api/queue.go
index 269f81e82..d18c544c6 100644
--- a/api/queue.go
+++ b/api/queue.go
@@ -171,6 +171,7 @@ func Stream(c *gin.Context) {
 		wg.Done()
 	}()
 
+	wc.Close()
 	wg.Wait()
 	c.String(200, "")
 
diff --git a/stream/stream_impl.go b/stream/stream_impl.go
index 5411e26bb..9be945c9a 100644
--- a/stream/stream_impl.go
+++ b/stream/stream_impl.go
@@ -61,8 +61,9 @@ func (s *stream) Delete(name string) error {
 	if !s.exists(name) {
 		return fmt.Errorf("stream: cannot delete stream %s, not found", name)
 	}
+	w := s.writers[name]
 	delete(s.writers, name)
-	return s.writers[name].Close()
+	return w.Close()
 }
 
 func (s *stream) exists(name string) bool {