diff --git a/iOSClient/Files/NCFiles.swift b/iOSClient/Files/NCFiles.swift
index 0bb1dc3f75..98eb03b087 100644
--- a/iOSClient/Files/NCFiles.swift
+++ b/iOSClient/Files/NCFiles.swift
@@ -125,7 +125,13 @@ class NCFiles: NCCollectionViewCommon {
         guard !isSearchingMode else {
             return super.reloadDataSource()
         }
-        self.semaphoreReloadDataSource.wait()
+        // self.semaphoreReloadDataSource.wait()
+
+        if self.semaphoreReloadDataSource.wait(timeout: .now() + 2) == .success {
+            self.semaphoreReloadDataSource.signal()
+        } else {
+            self.semaphoreReloadDataSource.signal()
+        }
 
         var predicate = self.defaultPredicate
         let predicateDirectory = NSPredicate(format: "account == %@ AND serverUrl == %@", session.account, self.serverUrl)