diff --git a/pkg/api/query/grpc.go b/pkg/api/query/grpc.go
index 459b94b6f7..25464123a6 100644
--- a/pkg/api/query/grpc.go
+++ b/pkg/api/query/grpc.go
@@ -84,7 +84,6 @@ func (g *GRPCAPI) Query(request *querypb.QueryRequest, server querypb.Query_Quer
 	if err != nil {
 		return err
 	}
-	defer qry.Close()
 
 	result := qry.Exec(ctx)
 	if err := server.Send(querypb.NewQueryWarningsResponse(result.Warnings)); err != nil {
@@ -158,7 +157,6 @@ func (g *GRPCAPI) QueryRange(request *querypb.QueryRangeRequest, srv querypb.Que
 	if err != nil {
 		return err
 	}
-	defer qry.Close()
 
 	result := qry.Exec(ctx)
 	if err := srv.Send(querypb.NewQueryRangeWarningsResponse(result.Warnings)); err != nil {
diff --git a/pkg/api/query/v1.go b/pkg/api/query/v1.go
index 9aa3534e5b..bb72f0321d 100644
--- a/pkg/api/query/v1.go
+++ b/pkg/api/query/v1.go
@@ -374,7 +374,6 @@ func (qapi *QueryAPI) query(r *http.Request) (interface{}, []error, *api.ApiErro
 	if err != nil {
 		return nil, nil, &api.ApiError{Typ: api.ErrorBadData, Err: err}
 	}
-	defer qry.Close()
 
 	tracing.DoInSpan(ctx, "query_gate_ismyturn", func(ctx context.Context) {
 		err = qapi.gate.Start(ctx)
@@ -503,7 +502,6 @@ func (qapi *QueryAPI) queryRange(r *http.Request) (interface{}, []error, *api.Ap
 	if err != nil {
 		return nil, nil, &api.ApiError{Typ: api.ErrorBadData, Err: err}
 	}
-	defer qry.Close()
 
 	tracing.DoInSpan(ctx, "query_gate_ismyturn", func(ctx context.Context) {
 		err = qapi.gate.Start(ctx)