diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93c8227d9765..395f608e85ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fix broken app when management is turned off ([#4891](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4891))
 - Correct the generated path for downloading plugins by their names on Windows ([#4953](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4953))
 - [BUG] Fix buildPointSeriesData unit test fails due to local timezone ([#4992](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/4992))
+- [BUG][Data Explorer][Discover] Fix total hits issue for no time based data ([#5087](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5087))
 
 ### 🚞 Infrastructure
 
diff --git a/src/plugins/discover/public/application/components/chart/chart.tsx b/src/plugins/discover/public/application/components/chart/chart.tsx
index 8ba188af3dd9..f21ce3e4ef19 100644
--- a/src/plugins/discover/public/application/components/chart/chart.tsx
+++ b/src/plugins/discover/public/application/components/chart/chart.tsx
@@ -21,8 +21,8 @@ import { useDiscoverContext } from '../../view_components/context';
 import { setInterval, useDispatch, useSelector } from '../../utils/state_management';
 
 interface DiscoverChartProps {
-  bucketInterval: TimechartHeaderBucketInterval;
-  chartData: Chart;
+  bucketInterval?: TimechartHeaderBucketInterval;
+  chartData?: Chart;
   config: IUiSettingsClient;
   data: DataPublicPluginStart;
   hits: number;
diff --git a/src/plugins/discover/public/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap b/src/plugins/discover/public/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap
index 075cafd37471..5da67e79a7c7 100644
--- a/src/plugins/discover/public/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap
+++ b/src/plugins/discover/public/application/components/doc_viewer_links/__snapshots__/doc_viewer_links.test.tsx.snap
@@ -17,6 +17,7 @@ exports[`Render <DocViewerLink/> with 2 different links 1`] = `
     key="0"
   >
     <EuiLink
+      data-test-subj="docTableRowAction"
       href="aaa"
       style={
         Object {
@@ -33,6 +34,7 @@ exports[`Render <DocViewerLink/> with 2 different links 1`] = `
     key="1"
   >
     <EuiLink
+      data-test-subj="docTableRowAction"
       href="bbb"
       style={
         Object {
diff --git a/src/plugins/discover/public/application/view_components/canvas/discover_chart_container.tsx b/src/plugins/discover/public/application/view_components/canvas/discover_chart_container.tsx
index 568d61c2e4e0..ec57e086f8d4 100644
--- a/src/plugins/discover/public/application/view_components/canvas/discover_chart_container.tsx
+++ b/src/plugins/discover/public/application/view_components/canvas/discover_chart_container.tsx
@@ -20,7 +20,7 @@ export const DiscoverChartContainer = ({ hits, bucketInterval, chartData }: Sear
     indexPattern,
   ]);
 
-  if (!hits || !chartData || !bucketInterval) return null;
+  if (!hits) return null;
 
   return (
     <DiscoverChart