diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
index 429252fe7..df753ddf3 100644
--- a/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
+++ b/packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts
@@ -65,7 +65,10 @@ export class MessagingMessageService {
             messageExternalId: message.externalId,
             messageThreadExternalId: message.messageThreadExternalId,
           },
-          ['messageChannelId', 'messageId'],
+          {
+            conflictPaths: ['messageChannelId', 'messageId'],
+            indexPredicate: '"deletedAt" IS NULL',
+          },
           transactionManager,
         );