diff --git a/extensions/mssql/src/objectManagement/ui/databaseDialog.ts b/extensions/mssql/src/objectManagement/ui/databaseDialog.ts
index 317863c071..dee011048c 100644
--- a/extensions/mssql/src/objectManagement/ui/databaseDialog.ts
+++ b/extensions/mssql/src/objectManagement/ui/databaseDialog.ts
@@ -1759,11 +1759,12 @@ export class DatabaseDialog extends ObjectManagementDialogBase<Database, Databas
 		// Wait Statistics Capture Mode - supported from 2017 or higher
 		if (!isUndefinedOrNull(this.objectInfo.queryStoreOptions.waitStatisticsCaptureMode)) {
 			this.waitStatisticsCaptureMode = this.createDropdown(localizedConstants.WaitStatisticsCaptureModeText, async (newValue) => {
-				this.objectInfo.queryStoreOptions.waitStatisticsCaptureMode = newValue as string;
+				// waitStatisticsCaptureMode value comes as On/Off, but options we provide are ON/OFF, handling selected value to match with the incoming value
+				this.objectInfo.queryStoreOptions.waitStatisticsCaptureMode = newValue.charAt(0) + newValue.slice(1).toLowerCase() as string;
 			}, this.viewInfo.propertiesOnOffOptions, this.objectInfo.queryStoreOptions.waitStatisticsCaptureMode.toUpperCase(), this.areQueryStoreOptionsEnabled, DefaultInputWidth);
 			containers.push(this.createLabelInputContainer(localizedConstants.WaitStatisticsCaptureModeText, this.waitStatisticsCaptureMode));
 		}
-		const retentionSection = this.createGroup(localizedConstants.WaitStatisticsCaptureModeText, containers, true);
+		const retentionSection = this.createGroup(localizedConstants.QueryStoreRetentionSectionText, containers, true);
 		this.queryStoreTabSectionsContainer.push(retentionSection);
 	}