diff --git a/assets/js/components/wp-dashboard/WPDashboardClicks.js b/assets/js/components/wp-dashboard/WPDashboardClicks.js
index 6971b2ea397..49d6ef58bb1 100644
--- a/assets/js/components/wp-dashboard/WPDashboardClicks.js
+++ b/assets/js/components/wp-dashboard/WPDashboardClicks.js
@@ -94,10 +94,7 @@ const WPDashboardClicks = ( { WidgetReportZero, WidgetReportError } ) => {
 		);
 	}
 
-	if (
-		isZeroReport( data ) &&
-		( zeroDataStatesEnabled ? isGatheringData === false : isGatheringData )
-	) {
+	if ( ! zeroDataStatesEnabled && isGatheringData && isZeroReport( data ) ) {
 		return <WidgetReportZero moduleSlug="search-console" />;
 	}
 
diff --git a/assets/js/components/wp-dashboard/WPDashboardImpressions.js b/assets/js/components/wp-dashboard/WPDashboardImpressions.js
index 57842294033..0961d4f3ad2 100644
--- a/assets/js/components/wp-dashboard/WPDashboardImpressions.js
+++ b/assets/js/components/wp-dashboard/WPDashboardImpressions.js
@@ -94,10 +94,7 @@ const WPDashboardImpressions = ( { WidgetReportZero, WidgetReportError } ) => {
 		);
 	}
 
-	if (
-		isZeroReport( data ) &&
-		( zeroDataStatesEnabled ? isGatheringData === false : isGatheringData )
-	) {
+	if ( ! zeroDataStatesEnabled && isGatheringData && isZeroReport( data ) ) {
 		return <WidgetReportZero moduleSlug="search-console" />;
 	}
 
diff --git a/assets/js/components/wp-dashboard/WPDashboardPopularPages.js b/assets/js/components/wp-dashboard/WPDashboardPopularPages.js
index 3f400752f3b..19ec4d11bfd 100644
--- a/assets/js/components/wp-dashboard/WPDashboardPopularPages.js
+++ b/assets/js/components/wp-dashboard/WPDashboardPopularPages.js
@@ -34,6 +34,7 @@ import {
 	MODULES_ANALYTICS,
 	DATE_RANGE_OFFSET,
 } from '../../modules/analytics/datastore/constants';
+import { ZeroDataMessage } from '../../modules/analytics/components/common';
 import { CORE_USER } from '../../googlesitekit/datastore/user/constants';
 import PreviewTable from '../../components/PreviewTable';
 import TableOverflowContainer from '../../components/TableOverflowContainer';
@@ -41,6 +42,7 @@ import ReportTable from '../ReportTable';
 import DetailsPermaLinks from '../DetailsPermaLinks';
 import { numFmt } from '../../util';
 import { isFeatureEnabled } from '../../features';
+import { isZeroReport } from '../../modules/analytics/util';
 const { useSelect, useInViewSelect } = Data;
 
 export default function WPDashboardPopularPages( props ) {
@@ -109,16 +111,19 @@ export default function WPDashboardPopularPages( props ) {
 		return <WidgetReportError moduleSlug="analytics" error={ error } />;
 	}
 
-	if ( isGatheringData && ! zeroDataStatesEnabled ) {
+	if (
+		! zeroDataStatesEnabled &&
+		isGatheringData &&
+		isZeroReport( report )
+	) {
 		return <WidgetReportZero moduleSlug="analytics" />;
 	}
 
-	// Skip rendering the table if there are no rows.
-	if ( ! report[ 0 ].data?.rows?.length ) {
-		return null;
+	// data.rows is not guaranteed to be set so we need a fallback.
+	let rows = [];
+	if ( report[ 0 ].data.rows ) {
+		rows = cloneDeep( report[ 0 ].data.rows );
 	}
-
-	const rows = cloneDeep( report[ 0 ].data.rows );
 	// Combine the titles from the pageTitles with the rows from the metrics report.
 	rows.forEach( ( row ) => {
 		const url = row.dimensions[ 0 ];
@@ -136,6 +141,7 @@ export default function WPDashboardPopularPages( props ) {
 					columns={ tableColumns }
 					limit={ 5 }
 					gatheringData={ isGatheringData }
+					zeroState={ ZeroDataMessage }
 				/>
 			</TableOverflowContainer>
 		</div>
diff --git a/assets/js/components/wp-dashboard/WPDashboardSessionDuration.js b/assets/js/components/wp-dashboard/WPDashboardSessionDuration.js
index fc5ab56c026..ac702779a60 100644
--- a/assets/js/components/wp-dashboard/WPDashboardSessionDuration.js
+++ b/assets/js/components/wp-dashboard/WPDashboardSessionDuration.js
@@ -89,10 +89,7 @@ const WPDashboardSessionDuration = ( {
 		return <WidgetReportError moduleSlug="analytics" error={ error } />;
 	}
 
-	if (
-		isZeroReport( data ) &&
-		( zeroDataStatesEnabled ? isGatheringData === false : isGatheringData )
-	) {
+	if ( ! zeroDataStatesEnabled && isGatheringData && isZeroReport( data ) ) {
 		return <WidgetReportZero moduleSlug="analytics" />;
 	}
 
diff --git a/assets/js/components/wp-dashboard/WPDashboardUniqueVisitors.js b/assets/js/components/wp-dashboard/WPDashboardUniqueVisitors.js
index ac691f21fb3..c48f5b9a96b 100644
--- a/assets/js/components/wp-dashboard/WPDashboardUniqueVisitors.js
+++ b/assets/js/components/wp-dashboard/WPDashboardUniqueVisitors.js
@@ -87,10 +87,7 @@ const WPDashboardUniqueVisitors = ( {
 		return <WidgetReportError moduleSlug="analytics" error={ error } />;
 	}
 
-	if (
-		isZeroReport( data ) &&
-		( zeroDataStatesEnabled ? isGatheringData === false : isGatheringData )
-	) {
+	if ( ! zeroDataStatesEnabled && isGatheringData && isZeroReport( data ) ) {
 		return <WidgetReportZero moduleSlug="analytics" />;
 	}