diff --git a/src/platform/packages/shared/presentation/presentation_publishing/interfaces/publishes_data_views.ts b/src/platform/packages/shared/presentation/presentation_publishing/interfaces/publishes_data_views.ts
index 0518e1d6c2892..cbbc47847433c 100644
--- a/src/platform/packages/shared/presentation/presentation_publishing/interfaces/publishes_data_views.ts
+++ b/src/platform/packages/shared/presentation/presentation_publishing/interfaces/publishes_data_views.ts
@@ -11,8 +11,7 @@ import { DataView } from '@kbn/data-views-plugin/common';
 import { PublishingSubject } from '../publishing_subject';
 
 /**
- * This API publishes a list of data views that it uses. Note that this should not contain any
- * ad-hoc data views.
+ * This API publishes a list of data views that it uses.
  */
 export interface PublishesDataViews {
   dataViews$: PublishingSubject<DataView[] | undefined>;
diff --git a/src/platform/plugins/shared/controls/public/control_group/get_control_group_factory.tsx b/src/platform/plugins/shared/controls/public/control_group/get_control_group_factory.tsx
index c6d628a3d7ef5..f90e893e2a4de 100644
--- a/src/platform/plugins/shared/controls/public/control_group/get_control_group_factory.tsx
+++ b/src/platform/plugins/shared/controls/public/control_group/get_control_group_factory.tsx
@@ -110,7 +110,7 @@ export const getControlGroupEmbeddableFactory = () => {
         isEditingEnabled: () => true,
         openAddDataControlFlyout: (settings) => {
           const parentDataViewId = apiPublishesDataViews(parentApi)
-            ? parentApi.dataViews$.value?.[0]?.id
+            ? parentApi.dataViews$.value?.find((dataView) => dataView.isPersisted())?.id
             : undefined;
           const newControlState = controlsManager.getNewControlState();
 
diff --git a/src/platform/plugins/shared/dashboard/public/dashboard_api/data_views_manager.ts b/src/platform/plugins/shared/dashboard/public/dashboard_api/data_views_manager.ts
index ce1b799d3ee7c..fd9215aa86492 100644
--- a/src/platform/plugins/shared/dashboard/public/dashboard_api/data_views_manager.ts
+++ b/src/platform/plugins/shared/dashboard/public/dashboard_api/data_views_manager.ts
@@ -42,9 +42,7 @@ export function initializeDataViewsManager(
   const dataViewsSubscription = combineLatest([controlGroupDataViewsPipe, childDataViewsPipe])
     .pipe(
       switchMap(async ([controlGroupDataViews, childDataViews]) => {
-        const allDataViews = [...(controlGroupDataViews ?? []), ...childDataViews].filter(
-          (dataView) => dataView.isPersisted()
-        );
+        const allDataViews = [...(controlGroupDataViews ?? []), ...childDataViews];
 
         if (allDataViews.length === 0) {
           try {