diff --git a/src/reactviews/pages/QueryResult/resultGrid.tsx b/src/reactviews/pages/QueryResult/resultGrid.tsx index e289c90b78..5b3e27c52d 100644 --- a/src/reactviews/pages/QueryResult/resultGrid.tsx +++ b/src/reactviews/pages/QueryResult/resultGrid.tsx @@ -239,7 +239,14 @@ const ResultGrid = forwardRef( let dataProvider = new HybridDataProvider( collection, (_startIndex, _count) => { - return props.loadFunc(_startIndex, _count); + if ( + props.resultSetSummary?.rowCount && + props.resultSetSummary?.rowCount > 0 + ) { + return props.loadFunc(_startIndex, _count); + } else { + return Promise.resolve([]); + } }, (data: DbCellValue) => { if (!data || data.isNull) {