diff --git a/test/functional/apps/discover/group6/_field_stats_table.ts b/test/functional/apps/discover/group6/_field_stats_table.ts
index a8463eb74c66a..4d295ef5ca95c 100644
--- a/test/functional/apps/discover/group6/_field_stats_table.ts
+++ b/test/functional/apps/discover/group6/_field_stats_table.ts
@@ -66,10 +66,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
         it('should not show Field Statistics data in ES|QL mode', async () => {
           await discover.selectTextBaseLang();
+          await header.waitUntilLoadingHasFinished();
           await discover.waitUntilSearchingHasFinished();
-
           await testSubjects.missingOrFail('dscViewModeFieldStatsButton');
-          await header.waitUntilLoadingHasFinished();
         });
       });
     });
diff --git a/test/functional/apps/discover/group6/_view_mode_toggle.ts b/test/functional/apps/discover/group6/_view_mode_toggle.ts
index 48bbc2fb49115..2591716c87d00 100644
--- a/test/functional/apps/discover/group6/_view_mode_toggle.ts
+++ b/test/functional/apps/discover/group6/_view_mode_toggle.ts
@@ -115,6 +115,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           await discover.selectTextBaseLang();
 
           await testSubjects.missingOrFail('dscViewModeToggle');
+          await testSubjects.existOrFail('discoverQueryTotalHits');
 
           if (!useLegacyTable) {
             await testSubjects.existOrFail('unifiedDataTableToolbar');
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/embeddable_error_msg.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/embeddable_error_msg.tsx
index 623a8e171f3db..9e49570ab6bfa 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/embeddable_error_msg.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/grid_embeddable/embeddable_error_msg.tsx
@@ -21,7 +21,6 @@ const FieldStatsUnavailableMessage = ({
   title = FIELD_STATS_UNAVAILABLE_TITLE,
 }: {
   id?: string;
-  content: string;
   title?: string;
 }) => {
   return (