diff --git a/pkg/tsdb/request.go b/pkg/tsdb/request.go
index 88c6eb81eac..2934443bc53 100644
--- a/pkg/tsdb/request.go
+++ b/pkg/tsdb/request.go
@@ -51,6 +51,8 @@ func HandleRequest(ctx context.Context, req *Request) (*Response, error) {
 					go batch.process(ctx, context)
 				}
 			}
+		case <-ctx.Done():
+			return nil, ctx.Err()
 		}
 	}