diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-fetch-messages-by-batches.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-fetch-messages-by-batches.service.ts
index fbdfa5dab..ed45d3622 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-fetch-messages-by-batches.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-fetch-messages-by-batches.service.ts
@@ -114,6 +114,14 @@ export class MessagingGmailFetchMessagesByBatchesService {
           return null;
         }
 
+        if (!headerMessageId) {
+          this.logger.log(
+            `Header Message ID is missing while importing message in workspace ${workspaceId} and account ${connectedAccountId}`,
+          );
+
+          return null;
+        }
+
         const participants = [
           ...formatAddressObjectAsParticipants(from, 'from'),
           ...formatAddressObjectAsParticipants(to ?? deliveredTo, 'to'),
@@ -182,10 +190,6 @@ export class MessagingGmailFetchMessagesByBatchesService {
     const internalDate = message.internalDate;
 
     assert(id, 'ID is missing');
-    assert(
-      messageId,
-      'Message-ID is missing: ' + JSON.stringify(message.payload?.headers),
-    );
     assert(threadId, 'Thread-ID is missing');
     assert(historyId, 'History-ID is missing');
     assert(internalDate, 'Internal date is missing');
diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-messages-import.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-messages-import.service.ts
index 8e1349cac..73a9d485d 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-messages-import.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/drivers/gmail/services/messaging-gmail-messages-import.service.ts
@@ -158,6 +158,7 @@ export class MessagingGmailMessagesImportService {
       );
 
       if (error.code === undefined) {
+        // This should never happen as all errors must be known
         throw error;
       }