diff --git a/iOSClient/Main/Collection Common/NCCollectionViewCommon+Search.swift b/iOSClient/Main/Collection Common/NCCollectionViewCommon+Search.swift
index a192f32a3f..7a6c42c9d5 100644
--- a/iOSClient/Main/Collection Common/NCCollectionViewCommon+Search.swift	
+++ b/iOSClient/Main/Collection Common/NCCollectionViewCommon+Search.swift	
@@ -283,6 +283,21 @@ extension NCCollectionViewCommon {
 
         default:
             for entry in searchResult.entries {
+                if let fileId = entry.fileId,
+                   let metadata = database.getMetadataFromFileId(String(fileId)) {
+                    metadata.section = provider.name
+                    metadatas.append(metadata)
+                    continue
+                }
+
+                if let filePath = entry.filePath,
+                   let metadata = await loadMetadata(session: session,
+                                                     provider: provider,
+                                                     filePath: filePath) {
+                    metadatas.append(metadata)
+                    continue
+                }
+
                 let metadata = await NCManageDatabaseCreateMetadata().createMetadataAsync(
                     fileName: entry.title,
                     ocId: NSUUID().uuidString,