diff --git a/pkg/storage/unified/search/options.go b/pkg/storage/unified/search/options.go
index f3103e3c94e..ad08cc9557f 100644
--- a/pkg/storage/unified/search/options.go
+++ b/pkg/storage/unified/search/options.go
@@ -12,7 +12,8 @@ import (
 
 func NewSearchOptions(features featuremgmt.FeatureToggles, cfg *setting.Cfg, tracer tracing.Tracer, docs resource.DocumentBuilderSupplier, indexMetrics *resource.BleveIndexMetrics) (resource.SearchOptions, error) {
 	// Setup the search server
-	if features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearch) {
+	if features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearch) ||
+		features.IsEnabledGlobally(featuremgmt.FlagProvisioning) {
 		root := cfg.IndexPath
 		if root == "" {
 			root = filepath.Join(cfg.DataPath, "unified-search", "bleve")
diff --git a/pkg/tests/apis/provisioning/helper_test.go b/pkg/tests/apis/provisioning/helper_test.go
index 4842806952a..e46d3fdfc04 100644
--- a/pkg/tests/apis/provisioning/helper_test.go
+++ b/pkg/tests/apis/provisioning/helper_test.go
@@ -201,7 +201,6 @@ func runGrafana(t *testing.T, options ...grafanaOption) *provisioningTestHelper
 		AppModeProduction: false, // required for experimental APIs
 		EnableFeatureToggles: []string{
 			featuremgmt.FlagProvisioning,
-			featuremgmt.FlagUnifiedStorageSearch,
 			featuremgmt.FlagKubernetesClientDashboardsFolders,
 		},
 		UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
diff --git a/public/app/features/provisioning/GettingStarted/features.ts b/public/app/features/provisioning/GettingStarted/features.ts
index 80bb1ef3c88..8bcff361c68 100644
--- a/public/app/features/provisioning/GettingStarted/features.ts
+++ b/public/app/features/provisioning/GettingStarted/features.ts
@@ -5,7 +5,6 @@ export const requiredFeatureToggles: Array<keyof FeatureToggles> = [
   'provisioning',
   'kubernetesDashboards',
   'kubernetesClientDashboardsFolders',
-  'unifiedStorageSearch',
 ];
 
 /**
diff --git a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
index 865691dec3f..9b1a9918edf 100644
--- a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
@@ -82,7 +82,7 @@ export class UnthemedQueryEditor extends PureComponent<Props, State> {
         description: 'Search for grafana resources',
       });
     }
-    if (config.featureToggles.unifiedStorageSearch) {
+    if (config.featureToggles.unifiedStorageSearchUI) {
       this.queryTypes.push({
         label: 'Search (experimental)',
         value: GrafanaQueryType.SearchNext,