diff --git a/packages/twenty-server/src/engine/metadata-modules/message-folder/data-access/services/message-folder-data-access.service.ts b/packages/twenty-server/src/engine/metadata-modules/message-folder/data-access/services/message-folder-data-access.service.ts
index 5937cbef604..38c13779022 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-folder/data-access/services/message-folder-data-access.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-folder/data-access/services/message-folder-data-access.service.ts
@@ -44,7 +44,9 @@ export class MessageFolderDataAccessService {
     const parentFolderId = coreData.parentFolderId as string | null;
     const channelId = (coreData.messageChannelId as string) ?? messageChannelId;
 
-    if (parentFolderId && !uuidValidate(parentFolderId) && channelId) {
+    if (!parentFolderId) {
+      coreData.parentFolderId = null;
+    } else if (!uuidValidate(parentFolderId) && channelId) {
       const parentFolder = await this.coreRepository.findOne({
         where: {
           workspaceId,