diff --git a/SyncExtension/UseCases/All/GetFileOrFolderMetaUseCase.swift b/SyncExtension/UseCases/All/GetFileOrFolderMetaUseCase.swift
index 144ceb96..aac6b045 100644
--- a/SyncExtension/UseCases/All/GetFileOrFolderMetaUseCase.swift
+++ b/SyncExtension/UseCases/All/GetFileOrFolderMetaUseCase.swift
@@ -118,7 +118,7 @@ struct GetFileOrFolderMetaUseCase {
 
                         let folderItem = FileProviderItem(
                             identifier: self.identifier,
-                            filename: folderMeta.plainName ?? folderMeta.name,
+                            filename: folderMeta.plainName,
                             parentId: parentId,
                             createdAt: createdAt,
                             updatedAt: updatedAt,
diff --git a/SyncExtension/UseCases/All/Workspaces/GetFileOrFolderMetaWorkspaceUseCase.swift b/SyncExtension/UseCases/All/Workspaces/GetFileOrFolderMetaWorkspaceUseCase.swift
index 1b5c2173..014996a6 100644
--- a/SyncExtension/UseCases/All/Workspaces/GetFileOrFolderMetaWorkspaceUseCase.swift
+++ b/SyncExtension/UseCases/All/Workspaces/GetFileOrFolderMetaWorkspaceUseCase.swift
@@ -104,7 +104,7 @@ struct GetFileOrFolderMetaWorkspaceUseCase {
                     let folderItem = FileProviderItem(
                         identifier: self.identifier,
                         // TODO: Decrypt the name if needed
-                        filename: folderMeta.plainName ?? folderMeta.name,
+                        filename: folderMeta.plainName,
                         parentId: parentId,
                         createdAt: createdAt,
                         updatedAt: updatedAt,
diff --git a/SyncExtension/UseCases/Folders/GetFolderMetaUseCase.swift b/SyncExtension/UseCases/Folders/GetFolderMetaUseCase.swift
index 743ab7f3..d00bd57c 100644
--- a/SyncExtension/UseCases/Folders/GetFolderMetaUseCase.swift
+++ b/SyncExtension/UseCases/Folders/GetFolderMetaUseCase.swift
@@ -48,7 +48,7 @@ struct GetFolderMetaUseCase {
                 
                 let folderItem = FileProviderItem(
                     identifier: self.identifier,
-                    filename: folderMeta.name,
+                    filename: folderMeta.plainName,
                     parentId: parentId ,
                     createdAt: createdAt,
                     updatedAt: updateAt,