diff --git a/stream.go b/stream.go
index b77e4f2a..0a24656c 100644
--- a/stream.go
+++ b/stream.go
@@ -246,6 +246,9 @@ func (s *Stream) waitForChunk(w http.ResponseWriter, chunk *Chunk) {
 	if chunk.done {
 		s.returnChunk(w, chunk)
 	}
+
+	// Return timeout error
+	w.WriteHeader(http.StatusRequestTimeout)
 }
 
 func (s *Stream) restartAtChunk(w http.ResponseWriter, id int) {