diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts
index bc2743bb88..cdf345f468 100644
--- a/src/sql/azdata.d.ts
+++ b/src/sql/azdata.d.ts
@@ -948,7 +948,7 @@ declare module 'azdata' {
 		hasError: boolean;
 		id: number;
 		selection: ISelectionData;
-		resultSetSummaries: ResultSetSummary[];
+		resultSetSummaries: ResultSetSummary[] | null;
 		executionElapsed: string;
 		executionEnd: string;
 		executionStart: string;
diff --git a/src/sql/workbench/contrib/query/browser/queryResultsView.ts b/src/sql/workbench/contrib/query/browser/queryResultsView.ts
index 0a500983b5..6244a6b871 100644
--- a/src/sql/workbench/contrib/query/browser/queryResultsView.ts
+++ b/src/sql/workbench/contrib/query/browser/queryResultsView.ts
@@ -201,7 +201,7 @@ export class QueryResultsView extends Disposable {
 	private hasResults(runner: QueryRunner): boolean {
 		let hasResults = false;
 		for (const batch of runner.batchSets) {
-			if (batch.resultSetSummaries.length > 0) {
+			if (batch.resultSetSummaries?.length > 0) {
 				hasResults = true;
 				break;
 			}
diff --git a/src/sql/workbench/contrib/query/browser/statusBarItems.ts b/src/sql/workbench/contrib/query/browser/statusBarItems.ts
index 8d0bce09a8..b26846c8e8 100644
--- a/src/sql/workbench/contrib/query/browser/statusBarItems.ts
+++ b/src/sql/workbench/contrib/query/browser/statusBarItems.ts
@@ -193,11 +193,12 @@ export class RowCountStatusBarContributions extends Disposable implements IWorkb
 		}
 	}
 
-	private _displayValue(runner: QueryRunner) {
+	private _displayValue(runner: QueryRunner): void {
 		const rowCount = runner.batchSets.reduce((p, c) => {
-			return p + c.resultSetSummaries.reduce((rp, rc) => {
+			const cnt = c.resultSetSummaries?.reduce((rp, rc) => {
 				return rp + rc.rowCount;
-			}, 0);
+			}, 0) ?? 0;
+			return p + cnt;
 		}, 0);
 		const text = localize('rowCount', "{0} rows", rowCount.toLocaleString());
 		this.statusItem.update({ text, ariaLabel: text });
diff --git a/src/sql/workbench/services/query/common/query.ts b/src/sql/workbench/services/query/common/query.ts
index d036874e91..c9a64f004a 100644
--- a/src/sql/workbench/services/query/common/query.ts
+++ b/src/sql/workbench/services/query/common/query.ts
@@ -34,7 +34,7 @@ export interface BatchStartSummary {
 
 export interface BatchSummary extends BatchStartSummary {
 	hasError: boolean;
-	resultSetSummaries: ResultSetSummary[];
+	resultSetSummaries: ResultSetSummary[] | null;
 }
 
 export interface CompleteBatchSummary extends BatchSummary {