diff --git a/plugins/woocommerce-admin/client/marketplace/components/content/content.tsx b/plugins/woocommerce-admin/client/marketplace/components/content/content.tsx
index 407bfa9e602..1670cfc35cc 100644
--- a/plugins/woocommerce-admin/client/marketplace/components/content/content.tsx
+++ b/plugins/woocommerce-admin/client/marketplace/components/content/content.tsx
@@ -167,7 +167,13 @@ export default function Content(): JSX.Element {
 				controller.abort();
 			} );
 		};
-	}, [ query.term, query.category ] ); // Depend on term and category
+	}, [
+		query.term,
+		query.category,
+		setHasBusinessServices,
+		setIsLoading,
+		setSearchResultsCount,
+	] ); // Depend on term and category
 
 	// Filter the products based on the selected tab
 	useEffect( () => {
diff --git a/plugins/woocommerce-admin/client/marketplace/components/product-list-content/no-results.tsx b/plugins/woocommerce-admin/client/marketplace/components/product-list-content/no-results.tsx
index 90c87fe5c6d..188902a9aed 100644
--- a/plugins/woocommerce-admin/client/marketplace/components/product-list-content/no-results.tsx
+++ b/plugins/woocommerce-admin/client/marketplace/components/product-list-content/no-results.tsx
@@ -67,7 +67,7 @@ export default function NoResults( props: {
 			.finally( () => {
 				setIsLoading( false );
 			} );
-	}, [] );
+	}, [ productGroupsForSearchType, props.type ] );
 
 	function productListTitle( groupId: string ) {
 		if ( groupId === 'popular-themes' ) {
diff --git a/plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx b/plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx
index 585ffb1267a..290d9960c12 100644
--- a/plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx
+++ b/plugins/woocommerce-admin/client/marketplace/components/tabs/tabs.tsx
@@ -178,7 +178,7 @@ const Tabs = ( props: TabsProps ): JSX.Element => {
 		} else if ( Object.keys( query ).length > 0 ) {
 			setSelectedTab( DEFAULT_TAB_KEY );
 		}
-	}, [ query, setSelectedTab ] );
+	}, [ query, setSelectedTab, tabs ] );
 
 	useEffect( () => {
 		setVisibleTabs(
@@ -188,7 +188,7 @@ const Tabs = ( props: TabsProps ): JSX.Element => {
 		if ( selectedTab === 'business-services' && ! hasBusinessServices ) {
 			setUrlTabParam( 'extensions', query );
 		}
-	}, [ selectedTab, hasBusinessServices ] );
+	}, [ selectedTab, hasBusinessServices, query, tabs ] );
 
 	return (
 		<nav