diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts
index e4b01a0582..d4a574b5cf 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-get-message-list.service.ts
@@ -2,10 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { ConnectedAccountProvider } from 'twenty-shared/types';
 
-import {
-  MessageFolderImportPolicy,
-  type MessageChannelWorkspaceEntity,
-} from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+import { type MessageChannelWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 import { MessageFolderWorkspaceEntity } from 'src/modules/messaging/common/standard-objects/message-folder.workspace-entity';
 import {
   MessageImportDriverException,
@@ -33,30 +30,24 @@ export class MessagingGetMessageListService {
     messageChannel: MessageChannelWorkspaceEntity,
     messageFolders: MessageFolder[],
   ): Promise<GetMessageListsResponse> {
-    const messageFoldersToSync: MessageFolder[] =
-      messageChannel.messageFolderImportPolicy ===
-      MessageFolderImportPolicy.ALL_FOLDERS
-        ? messageFolders
-        : messageFolders.filter((folder) => folder.isSynced);
-
     switch (messageChannel.connectedAccount.provider) {
       case ConnectedAccountProvider.GOOGLE:
         return await this.gmailGetMessageListService.getMessageLists({
           messageChannel,
           connectedAccount: messageChannel.connectedAccount,
-          messageFolders: messageFoldersToSync,
+          messageFolders,
         });
       case ConnectedAccountProvider.MICROSOFT:
         return this.microsoftGetMessageListService.getMessageLists({
           messageChannel,
           connectedAccount: messageChannel.connectedAccount,
-          messageFolders: messageFoldersToSync,
+          messageFolders,
         });
       case ConnectedAccountProvider.IMAP_SMTP_CALDAV: {
         return await this.imapGetMessageListService.getMessageLists({
           messageChannel,
           connectedAccount: messageChannel.connectedAccount,
-          messageFolders: messageFoldersToSync,
+          messageFolders,
         });
       }
       default:
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts
index 5672b052cf..1d0fd81162 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message-list-fetch.service.ts
@@ -15,6 +15,7 @@ import {
   MessageChannelPendingGroupEmailsAction,
   MessageChannelSyncStage,
   MessageChannelWorkspaceEntity,
+  MessageFolderImportPolicy,
 } from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
 import {
   MessageFolderPendingSyncAction,
@@ -135,10 +136,16 @@ export class MessagingMessageListFetchService {
         },
       });
 
+      const messageFoldersToSync =
+        messageChannelWithFreshTokens.messageFolderImportPolicy ===
+        MessageFolderImportPolicy.ALL_FOLDERS
+          ? messageFolders
+          : messageFolders.filter((folder) => folder.isSynced);
+
       const messageLists =
         await this.messagingGetMessageListService.getMessageLists(
           messageChannelWithFreshTokens,
-          messageFolders,
+          messageFoldersToSync,
         );
 
       await this.cacheStorage.del(