diff --git a/app/screens/home/search/results/header.tsx b/app/screens/home/search/results/header.tsx
index 0e2041dec..8f5a5d5f7 100644
--- a/app/screens/home/search/results/header.tsx
+++ b/app/screens/home/search/results/header.tsx
@@ -118,7 +118,7 @@ const Header = ({
             theme,
             title,
         });
-    }, [selectedFilter]);
+    }, [onFilterChanged, selectedFilter]);
 
     const filterStyle = useMemo(() => ({marginRight: teams.length > 1 ? 0 : 10}), [teams.length > 1]);
 
diff --git a/app/screens/home/search/results/results.tsx b/app/screens/home/search/results/results.tsx
index b3f42023d..d0eac7f26 100644
--- a/app/screens/home/search/results/results.tsx
+++ b/app/screens/home/search/results/results.tsx
@@ -74,7 +74,10 @@ const Results = ({
                 {translateX: withTiming(translateX, {duration})},
             ],
         };
-    }, [selectedTab, dimensions.width]);
+
+        // Do not transform if loading new data. Causes a case where post
+        // results show up in Files results when the team is changed
+    }, [selectedTab, dimensions.width, !loading]);
 
     const paddingTop = useMemo(() => (
         {paddingTop: scrollPaddingTop, flexGrow: 1}
diff --git a/app/screens/home/search/search.tsx b/app/screens/home/search/search.tsx
index 8a9c6ecc3..f10dd256b 100644
--- a/app/screens/home/search/search.tsx
+++ b/app/screens/home/search/search.tsx
@@ -163,14 +163,13 @@ const SearchScreen = ({teamId, teams}: Props) => {
     }, [showResults]);
 
     const handleSearch = useCallback(async (newSearchTeamId: string, term: string) => {
-        const searchParams = getSearchParams(term);
+        const searchParams = getSearchParams(term, filter);
         if (!searchParams.terms) {
             handleClearSearch();
             return;
         }
         hideHeader(true);
         handleLoading(true);
-        setFilter(FileFilters.ALL);
         setLastSearchedValue(term);
         addSearchToTeamSearchHistory(serverUrl, newSearchTeamId, term);
         const [postResults, {files, channels}] = await Promise.all([
@@ -186,7 +185,7 @@ const SearchScreen = ({teamId, teams}: Props) => {
         setFileChannelIds(channels?.length ? channels : emptyChannelIds);
         handleLoading(false);
         setShowResults(true);
-    }, [handleClearSearch, handleLoading]);
+    }, [filter, handleClearSearch, handleLoading]);
 
     const onBlur = useCallback(() => {
         setSearchIsFocused(false);