diff --git a/app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java b/app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java
index 9dbfddc41289..e9581f64a0b8 100644
--- a/app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java
@@ -569,6 +569,8 @@ private void synchronizeData(List<Object> folderAndFiles) {
         OCFile updatedFile;
         RemoteFile remote;
 
+        final boolean skipGetFileByPath = localFilesMap.isEmpty();
+
         for (int i = 1; i < folderAndFiles.size(); i++) {
             /// new OCFile instance with the data from the server
             remote = (RemoteFile) folderAndFiles.get(i);
@@ -582,7 +584,7 @@ private void synchronizeData(List<Object> folderAndFiles) {
             localFile = localFilesMap.remove(remoteFile.getRemotePath());
 
             // TODO better implementation is needed
-            if (localFile == null) {
+            if (localFile == null && !skipGetFileByPath) {
                 localFile = fileDataStorageManager.getFileByPath(updatedFile.getRemotePath());
             }