diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
index 6ea2bdb253aac..f10d09faa0495 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
@@ -61,12 +61,12 @@ function SearchFiltersCategoryPage() {
         const items = [{name: translate('search.noCategory'), value: CONST.SEARCH.CATEGORY_EMPTY_VALUE as string}];
         const uniqueCategoryNames = new Set<string>();
 
-        if (!selectedPoliciesCategories || selectedPoliciesCategories.length === 0) {
+        if (policyIDs.length === 0) {
             const categories = Object.values(allPolicyCategories ?? {}).flatMap((policyCategories) => Object.values(policyCategories ?? {}));
             for (const category of categories) {
                 uniqueCategoryNames.add(category.name);
             }
-        } else {
+        } else if (selectedPoliciesCategories.length > 0) {
             for (const category of selectedPoliciesCategories) {
                 uniqueCategoryNames.add(category.name);
             }
@@ -80,7 +80,7 @@ function SearchFiltersCategoryPage() {
                 }),
         );
         return items;
-    }, [allPolicyCategories, selectedPoliciesCategories, translate]);
+    }, [allPolicyCategories, policyIDs.length, selectedPoliciesCategories, translate]);
 
     const onSaveSelection = useCallback((values: string[]) => updateAdvancedFilters({category: values}), []);
 
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
index 99b7a5ecfb314..f3da68625743c 100644
--- a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
@@ -39,12 +39,12 @@ function SearchFiltersTagPage() {
         const items = [{name: translate('search.noTag'), value: CONST.SEARCH.TAG_EMPTY_VALUE as string}];
         const uniqueTagNames = new Set<string>();
 
-        if (!selectedPoliciesTagLists || selectedPoliciesTagLists.length === 0) {
+        if (policyIDs.length === 0) {
             const tagListsUnpacked = Object.values(allPolicyTagLists ?? {}).filter((item) => !!item);
             for (const tag of tagListsUnpacked.map(getTagNamesFromTagsLists).flat()) {
                 uniqueTagNames.add(tag);
             }
-        } else {
+        } else if (selectedPoliciesTagLists.length > 0) {
             for (const tag of selectedPoliciesTagLists) {
                 uniqueTagNames.add(tag);
             }
@@ -52,7 +52,7 @@ function SearchFiltersTagPage() {
         items.push(...Array.from(uniqueTagNames).map((tagName) => ({name: getCleanedTagName(tagName), value: tagName})));
 
         return items;
-    }, [allPolicyTagLists, selectedPoliciesTagLists, translate]);
+    }, [allPolicyTagLists, policyIDs.length, selectedPoliciesTagLists, translate]);
 
     const updateTagFilter = useCallback((values: string[]) => updateAdvancedFilters({tag: values}), []);