diff --git a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
index 8974c8df9b..2014f089d1 100644
--- a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
+++ b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
@@ -337,10 +337,14 @@ export default inject<TStore>(
     } = filesStore;
 
     const files = items
-      ? items.filter((f) => (f.fileExst || f.contentLength) && f)
+      ? items.filter((f) => {
+          if (f.isFile || f.fileExst || f.contentLength) return f;
+        })
       : [];
     const folders = items
-      ? items.filter((f) => !f.fileExst && !f.contentLength && f)
+      ? items.filter((f) => {
+          if (!f.fileExst && !f.contentLength && !f.isFile) return f;
+        })
       : [];
 
     return {
diff --git a/packages/client/src/store/UploadDataStore.js b/packages/client/src/store/UploadDataStore.js
index 51f93e16fe..34f3cdb11b 100644
--- a/packages/client/src/store/UploadDataStore.js
+++ b/packages/client/src/store/UploadDataStore.js
@@ -693,7 +693,10 @@ class UploadDataStore {
     let conflicts = await checkIsFileExist(toFolderId, filesArray);
     const folderInfo = await getFolderInfo(toFolderId);
 
-    conflicts = conflicts.map((fileTitle) => ({ title: fileTitle }));
+    conflicts = conflicts.map((fileTitle) => ({
+      title: fileTitle,
+      isFile: true,
+    }));
 
     if (conflicts.length > 0) {
       this.setConflictDialogData(conflicts, {