diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json
index 926cc44e2b..f35f071fed 100644
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -474,7 +474,7 @@
       "notebook/toolbar": [
         {
           "command": "mssql.exportNotebookToSql",
-          "when": "config.notebook.showNotebookConvertActions && providerId == sql"
+          "when": "config.workbench.enablePreviewFeatures && providerId == sql"
         }
       ]
     },
diff --git a/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts
index 53bfdfd7a5..abbf3c19b3 100644
--- a/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts
+++ b/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts
@@ -211,11 +211,6 @@ configurationRegistry.registerConfiguration({
 			'default': false,
 			'description': localize('notebook.showAllKernels', "(Preview) show all kernels for the current notebook provider.")
 		},
-		'notebook.showNotebookConvertActions': {
-			'type': 'boolean',
-			'default': false,
-			'description': localize('notebook.showNotebookConvertActions', "(Preview) Show buttons for converting a Notebook to and from SQL.")
-		},
 		'notebook.allowAzureDataStudioCommands': {
 			'type': 'boolean',
 			'default': false,
diff --git a/src/sql/workbench/contrib/query/browser/queryEditor.ts b/src/sql/workbench/contrib/query/browser/queryEditor.ts
index 1bb7241694..6146315f35 100644
--- a/src/sql/workbench/contrib/query/browser/queryEditor.ts
+++ b/src/sql/workbench/contrib/query/browser/queryEditor.ts
@@ -299,14 +299,11 @@ export class QueryEditor extends EditorPane {
 
 				if (providerId === 'MSSQL') {
 					content.push({ element: separator },
-						{ action: this._estimatedQueryPlanAction }, // Preview
-						{ action: this._toggleSqlcmdMode } // Preview)
+						{ action: this._estimatedQueryPlanAction },
+						{ action: this._toggleSqlcmdMode }
 					);
 
-					const notebookConvertActionsEnabled = this.configurationService.getValue('notebook')['showNotebookConvertActions'];
-					if (notebookConvertActionsEnabled) {
-						content.push({ action: this._exportAsNotebookAction });
-					}
+					content.push({ action: this._exportAsNotebookAction });
 				}
 			} else {
 				content = [
@@ -317,15 +314,6 @@ export class QueryEditor extends EditorPane {
 					{ action: this._changeConnectionAction },
 					{ action: this._listDatabasesAction }
 				];
-
-				if (providerId === 'MSSQL') {
-					const notebookConvertActionsEnabled = this.configurationService.getValue('notebook')['notebook.showNotebookConvertActions'];
-					if (notebookConvertActionsEnabled) {
-						content.push(
-							{ element: separator },
-							{ action: this._exportAsNotebookAction });
-					}
-				}
 			}
 		}