diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts index 4080dc08f..b92f99517 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts @@ -83,6 +83,7 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService { isGroupEmail(participant.handle); const shouldCreateContact = + !!participant.handle && !isParticipantConnectedAccount && !isExcludedByNonProfessionalEmails && !isExcludedByGroupEmails && diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts index 17dacb92c..ffdbef989 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/utils/filter-emails.util.ts @@ -66,10 +66,12 @@ const filterOutInternals = ( } const primaryHandleDomain = getDomainNameByEmail(primaryHandle); - const isAllHandlesFromSameDomain = message.participants.every( - (participant) => - getDomainNameByEmail(participant.handle) === primaryHandleDomain, - ); + const isAllHandlesFromSameDomain = message.participants + .filter((participant) => !!participant.handle) + .every( + (participant) => + getDomainNameByEmail(participant.handle) === primaryHandleDomain, + ); if (isAllHandlesFromSameDomain) { return false;