From b1a7c5c4d6b5493f7167d6f39ca271feafc3b2c0 Mon Sep 17 00:00:00 2001
From: neo773 <62795688+neo773@users.noreply.github.com>
Date: Wed, 18 Mar 2026 15:11:56 +0530
Subject: [PATCH] Fix null connectedAccount crash in blocklist message deletion
 job (#18723)

Fixes TWENTY-SERVER-DRP
---
 .../jobs/messaging-blocklist-item-delete-messages.job.ts     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts b/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts
index c2858b5fe3..1a6ad8e2d9 100644
--- a/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts
+++ b/packages/twenty-server/src/modules/messaging/blocklist-manager/jobs/messaging-blocklist-item-delete-messages.job.ts
@@ -2,7 +2,7 @@ import { Scope } from '@nestjs/common';
 
 import { MessageParticipantRole } from 'twenty-shared/types';
 import { isDefined } from 'twenty-shared/utils';
-import { And, Any, ILike, In, Not, Or } from 'typeorm';
+import { And, Any, ILike, In, IsNull, Not, Or } from 'typeorm';
 import { type ObjectRecordCreateEvent } from 'twenty-shared/database-events';
 
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
@@ -108,6 +108,7 @@ export class BlocklistItemDeleteMessagesJob {
           where: {
             connectedAccount: {
               accountOwnerId: workspaceMemberId,
+              deletedAt: IsNull(),
             },
           },
           relations: ['connectedAccount'],
@@ -116,7 +117,7 @@ export class BlocklistItemDeleteMessagesJob {
         for (const messageChannel of messageChannels) {
           const messageChannelHandles = [messageChannel.handle];
 
-          if (messageChannel.connectedAccount.handleAliases) {
+          if (isDefined(messageChannel.connectedAccount.handleAliases)) {
             messageChannelHandles.push(
               ...messageChannel.connectedAccount.handleAliases.split(','),
             );