diff --git a/src/sql/workbench/contrib/queryplan2/browser/queryPlan.ts b/src/sql/workbench/contrib/queryplan2/browser/queryPlan.ts
index 8fec6f7b94..0e163496fd 100644
--- a/src/sql/workbench/contrib/queryplan2/browser/queryPlan.ts
+++ b/src/sql/workbench/contrib/queryplan2/browser/queryPlan.ts
@@ -8,8 +8,6 @@ import type * as azdata from 'azdata';
 import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel';
 import { localize } from 'vs/nls';
 import { dispose } from 'vs/base/common/lifecycle';
-import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry';
-import { Registry } from 'vs/platform/registry/common/platform';
 import { ActionBar } from 'sql/base/browser/ui/taskbar/actionbar';
 import * as DOM from 'vs/base/browser/dom';
 import * as azdataGraphModule from 'azdataGraph';
@@ -620,24 +618,3 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
 		`);
 	}
 });
-
-
-/**
- * Registering a feature flag for query plan.
- * TODO: This should be removed before taking the feature to public preview.
- */
-const QUERYPLAN2_CONFIG_ID = 'queryPlan2';
-Registry.as<IConfigurationRegistry>(ConfigExtensions.Configuration).registerConfiguration({
-	id: QUERYPLAN2_CONFIG_ID,
-	title: localize('queryPlan2.configTitle', "Query Plan"),
-	type: 'object',
-	properties: {
-		'queryPlan2.enableFeature': {
-			'type': 'boolean',
-			'default': false,
-			'description': localize('queryPlan2.featureEnabledDescription', "Controls whether the new query plan feature is enabled. Default value is false.")
-		}
-	}
-});
-
-
diff --git a/src/sql/workbench/services/query/common/queryManagement.ts b/src/sql/workbench/services/query/common/queryManagement.ts
index bc17ee044a..611f2d0586 100644
--- a/src/sql/workbench/services/query/common/queryManagement.ts
+++ b/src/sql/workbench/services/query/common/queryManagement.ts
@@ -331,7 +331,7 @@ export class QueryManagementService implements IQueryManagementService {
 	public onResultSetUpdated(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void {
 		this._notify(resultSetInfo.ownerUri, (runner: QueryRunner) => {
 			runner.handleResultSetUpdated(resultSetInfo.resultSetSummary);
-			if (resultSetInfo.executionPlans && this._configurationService.getValue('queryPlan2.enableFeature')) {
+			if (resultSetInfo.executionPlans && this._configurationService.getValue('workbench.enablePreviewFeatures')) {
 				runner.handleQueryPlan2Available(resultSetInfo.executionPlans);
 			}
 		});