diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-non-destructive-event.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-non-destructive-event.ts
index b29204c04fcb..922d2b435a3f 100644
--- a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-non-destructive-event.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-non-destructive-event.ts
@@ -3,8 +3,8 @@ import { ObjectRecordDeleteEvent } from 'src/engine/core-modules/event-emitter/t
 import { ObjectRecordRestoreEvent } from 'src/engine/core-modules/event-emitter/types/object-record-restore.event';
 import { ObjectRecordUpdateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-update.event';
 
-export type ObjectRecordNonDestructiveEvent =
-  | ObjectRecordCreateEvent
-  | ObjectRecordUpdateEvent
-  | ObjectRecordDeleteEvent
-  | ObjectRecordRestoreEvent;
+export type ObjectRecordNonDestructiveEvent<T = object> =
+  | ObjectRecordCreateEvent<T>
+  | ObjectRecordUpdateEvent<T>
+  | ObjectRecordDeleteEvent<T>
+  | ObjectRecordRestoreEvent<T>;
diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-restore.event.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-restore.event.ts
index 070ecb0df502..9e364f4ad8ef 100644
--- a/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-restore.event.ts
+++ b/packages/twenty-server/src/engine/core-modules/event-emitter/types/object-record-restore.event.ts
@@ -1,8 +1,8 @@
-import { ObjectRecordCreateEvent } from 'src/engine/core-modules/event-emitter/types/object-record-create.event';
+import { ObjectRecordBaseEvent } from 'src/engine/core-modules/event-emitter/types/object-record.base.event';
 
 export class ObjectRecordRestoreEvent<
   T = object,
-> extends ObjectRecordCreateEvent<T> {
+> extends ObjectRecordBaseEvent<T> {
   properties: {
     after: T;
   };
diff --git a/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts b/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
index 00be0d5f69a6..56ea4a2cfb58 100644
--- a/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
+++ b/packages/twenty-server/src/modules/timeline/jobs/upsert-timeline-activity-from-internal-event.job.ts
@@ -5,6 +5,7 @@ import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queu
 import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
 import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event.type';
 import { TimelineActivityService } from 'src/modules/timeline/services/timeline-activity.service';
+import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
 import { WorkspaceMemberRepository } from 'src/modules/workspace-member/repositories/workspace-member.repository';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 
@@ -18,7 +19,9 @@ export class UpsertTimelineActivityFromInternalEvent {
 
   @Process(UpsertTimelineActivityFromInternalEvent.name)
   async handle(
-    workspaceEventBatch: WorkspaceEventBatch<ObjectRecordNonDestructiveEvent>,
+    workspaceEventBatch: WorkspaceEventBatch<
+      ObjectRecordNonDestructiveEvent<TimelineActivityWorkspaceEntity>
+    >,
   ): Promise<void> {
     for (const eventData of workspaceEventBatch.events) {
       if (eventData.userId) {
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 34ba7a35d2ac..1c1657e392f4 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
@@ -7,7 +7,10 @@ import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/work
 import { TimelineActivityRepository } from 'src/modules/timeline/repositiories/timeline-activity.repository';
 import { TimelineActivityWorkspaceEntity } from 'src/modules/timeline/standard-objects/timeline-activity.workspace-entity';
 
-type TimelineActivity = Omit<ObjectRecordNonDestructiveEvent, 'properties'> & {
+type TimelineActivity = Omit<
+  ObjectRecordNonDestructiveEvent<TimelineActivityWorkspaceEntity>,
+  'properties'
+> & {
   name: string;
   objectName?: string;
   linkedRecordCachedName?: string;
@@ -34,7 +37,7 @@ export class TimelineActivityService {
     eventName,
     workspaceId,
   }: {
-    event: ObjectRecordBaseEvent;
+    event: ObjectRecordBaseEvent<TimelineActivityWorkspaceEntity>;
     eventName: string;
     workspaceId: string;
   }) {