diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
index a246ff432..cb9548f8b 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventRow.tsx
@@ -176,7 +176,7 @@ export const CalendarEventRow = ({
: participant.displayName
}
placeholderColorSeed={
- participant.workspaceMemberId ?? participant.personId
+ participant.workspaceMemberId || participant.personId
}
type="rounded"
/>
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
index e381b1bac..bb7f8c140 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadPreview.tsx
@@ -1,5 +1,5 @@
-import { useRef } from 'react';
import styled from '@emotion/styled';
+import { useRef } from 'react';
import { useRecoilCallback } from 'recoil';
import { Avatar, GRAY_SCALE } from 'twenty-ui';
@@ -155,12 +155,20 @@ export const EmailThreadPreview = ({
{thread?.lastTwoParticipants?.[0] && (
)}
diff --git a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts
index a12c745fc..c26c03959 100644
--- a/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/calendar/timeline-calendar-event.service.ts
@@ -93,6 +93,8 @@ export class TimelineCalendarEventService {
participant.person?.name?.lastName ||
participant.workspaceMember?.name.firstName ||
participant.workspaceMember?.name.lastName ||
+ participant.displayName ||
+ participant.handle ||
'',
avatarUrl:
participant.person?.avatarUrl ||