diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener.ts
index a48b842b94..49389974f0 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-person.listener.ts
@@ -32,7 +32,7 @@ export class CalendarEventParticipantPersonListener {
     >,
   ) {
     for (const eventPayload of payload.events) {
-      if (eventPayload.properties.after.email === null) {
+      if (!eventPayload.properties.after.email) {
         continue;
       }
 
diff --git a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener.ts b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener.ts
index ab02392c52..6016c78c96 100644
--- a/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar-event-participant-manager/listeners/calendar-event-participant-workspace-member.listener.ts
@@ -32,7 +32,7 @@ export class CalendarEventParticipantWorkspaceMemberListener {
     >,
   ) {
     for (const eventPayload of payload.events) {
-      if (eventPayload.properties.after.userEmail === null) {
+      if (!eventPayload.properties.after.userEmail) {
         continue;
       }
 
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
index 2765c66112..8e42990c90 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-person.listener.ts
@@ -32,7 +32,7 @@ export class MessageParticipantPersonListener {
     >,
   ) {
     for (const eventPayload of payload.events) {
-      if (eventPayload.properties.after.email === null) {
+      if (!eventPayload.properties.after.email) {
         continue;
       }
 
diff --git a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
index 07968f379c..aeec32548a 100644
--- a/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
+++ b/packages/twenty-server/src/modules/messaging/message-participant-manager/listeners/message-participant-workspace-member.listener.ts
@@ -52,7 +52,7 @@ export class MessageParticipantWorkspaceMemberListener {
     }
 
     for (const eventPayload of payload.events) {
-      if (eventPayload.properties.after.userEmail === null) {
+      if (!eventPayload.properties.after.userEmail) {
         continue;
       }