diff --git a/app/actions/remote/search.ts b/app/actions/remote/search.ts
index 42b81e7997b..0010ab1a1f8 100644
--- a/app/actions/remote/search.ts
+++ b/app/actions/remote/search.ts
@@ -2,11 +2,12 @@
 // See LICENSE.txt for license information.
 
 import {getPosts} from '@actions/local/post';
+import {General} from '@app/constants';
 import {SYSTEM_IDENTIFIERS} from '@constants/database';
 import DatabaseManager from '@database/manager';
 import NetworkManager from '@managers/network_manager';
 import {prepareMissingChannelsForAllTeams} from '@queries/servers/channel';
-import {getConfigValue} from '@queries/servers/system';
+import {getConfigValue, getCurrentTeamId} from '@queries/servers/system';
 import {getIsCRTEnabled, prepareThreadsFromReceivedPosts} from '@queries/servers/thread';
 import {getCurrentUser} from '@queries/servers/user';
 import {getFullErrorMessage} from '@utils/errors';
@@ -18,6 +19,7 @@ import {fetchPostAuthors, fetchMissingChannelsFromPosts} from './post';
 import {forceLogoutIfNecessary} from './session';
 
 import type Model from '@nozbe/watermelondb/Model';
+import type ChannelModel from '@typings/database/models/servers/channel';
 import type PostModel from '@typings/database/models/servers/post';
 
 export async function fetchRecentMentions(serverUrl: string): Promise<PostSearchRequest> {
@@ -129,10 +131,15 @@ export const searchPosts = async (serverUrl: string, teamId: string, params: Pos
     }
 };
 
-export const searchFiles = async (serverUrl: string, teamId: string, params: FileSearchParams): Promise<{files?: FileInfo[]; channels?: string[]; error?: unknown}> => {
+export const searchFiles = async (serverUrl: string, teamId: string, params: FileSearchParams, channel?: ChannelModel): Promise<{files?: FileInfo[]; channels?: string[]; error?: unknown}> => {
     try {
+        let currentTeamId = teamId;
+        if (channel && (channel.type === General.DM_CHANNEL || channel.type === General.GM_CHANNEL)) {
+            const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
+            currentTeamId = await getCurrentTeamId(database);
+        }
         const client = NetworkManager.getClient(serverUrl);
-        const result = await client.searchFiles(teamId, params.terms);
+        const result = await client.searchFiles(currentTeamId, params.terms);
         const files = result?.file_infos ? Object.values(result.file_infos) : [];
         const [allChannelIds, allPostIds] = files.reduce<[Set<string>, Set<string>]>((acc, f) => {
             if (f.channel_id) {
diff --git a/app/screens/channel_files/channel_files.tsx b/app/screens/channel_files/channel_files.tsx
index d31da9cd55f..a924fadb603 100644
--- a/app/screens/channel_files/channel_files.tsx
+++ b/app/screens/channel_files/channel_files.tsx
@@ -98,7 +98,7 @@ function ChannelFiles({
         const t = Date.now();
         lastSearchRequest.current = t;
         const searchParams = getSearchParams(channel.id, searchTerm, ftr);
-        const {files} = await searchFiles(serverUrl, channel.teamId, searchParams);
+        const {files} = await searchFiles(serverUrl, channel.teamId, searchParams, channel);
         if (lastSearchRequest.current !== t) {
             return;
         }