diff --git a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
index 8704d4ee1ae..bf0421a44b2 100644
--- a/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
+++ b/packages/twenty-server/src/modules/timeline/repositories/timeline-activity.repository.ts
@@ -98,7 +98,7 @@ export class TimelineActivityRepository {
       ),
       name: In(payloads.map((payload) => payload.name)),
       workspaceMemberId: In(
-        payloads.map((payload) => payload.workspaceMemberId),
+        payloads.map((payload) => payload.workspaceMemberId || null),
       ),
       createdAt: MoreThan(tenMinutesAgo),
     };
diff --git a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
index 38518231dd2..fdefd07d731 100644
--- a/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
+++ b/packages/twenty-server/src/modules/timeline/services/timeline-activity.service.ts
@@ -223,7 +223,7 @@ export class TimelineActivityService {
 
           return {
             name: `linked-${activityType}.${action}`,
-            workspaceMemberId: event.workspaceMemberId ?? '',
+            workspaceMemberId: event.workspaceMemberId,
             recordId: activityTarget[targetColumn.replace(/Id$/, '')],
             linkedRecordCachedName: activityTitle,
             linkedRecordId: activityId,