diff --git a/front/src/generated/graphql.tsx b/front/src/generated/graphql.tsx
index a34a84150a1..6554a54f5ed 100644
--- a/front/src/generated/graphql.tsx
+++ b/front/src/generated/graphql.tsx
@@ -2319,7 +2319,7 @@ export type CreateActivityMutationVariables = Exact<{
 }>;
 
 
-export type CreateActivityMutation = { __typename?: 'Mutation', createOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, authorId: string, type: ActivityType, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, activityId: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null, comments?: Array<{ __typename?: 'Comment', id: string, createdAt: string, updatedAt: string, body: string, author: { __typename?: 'User', id: string } }> | null } };
+export type CreateActivityMutation = { __typename?: 'Mutation', createOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, authorId: string, type: ActivityType, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, activityId: string, commentableType?: CommentableType | null, commentableId?: string | null, companyId?: string | null, personId?: string | null }> | null, comments?: Array<{ __typename?: 'Comment', id: string, createdAt: string, updatedAt: string, body: string, author: { __typename?: 'User', id: string } }> | null } };
 
 export type GetActivitiesByTargetsQueryVariables = Exact<{
   activityTargetIds: Array<Scalars['String']> | Scalars['String'];
@@ -2327,7 +2327,7 @@ export type GetActivitiesByTargetsQueryVariables = Exact<{
 }>;
 
 
-export type GetActivitiesByTargetsQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, title?: string | null, body?: string | null, type: ActivityType, completedAt?: string | null, dueAt?: string | null, assignee?: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string, avatarUrl?: string | null } | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null }> };
+export type GetActivitiesByTargetsQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, title?: string | null, body?: string | null, type: ActivityType, completedAt?: string | null, dueAt?: string | null, assignee?: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string, avatarUrl?: string | null } | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType?: CommentableType | null, commentableId?: string | null, companyId?: string | null, personId?: string | null }> | null }> };
 
 export type GetActivitiesQueryVariables = Exact<{
   where: ActivityWhereInput;
@@ -2335,14 +2335,14 @@ export type GetActivitiesQueryVariables = Exact<{
 }>;
 
 
-export type GetActivitiesQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, title?: string | null, body?: string | null, type: ActivityType, completedAt?: string | null, dueAt?: string | null, assignee?: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string, avatarUrl?: string | null } | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null }> };
+export type GetActivitiesQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, title?: string | null, body?: string | null, type: ActivityType, completedAt?: string | null, dueAt?: string | null, assignee?: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string, avatarUrl?: string | null } | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType?: CommentableType | null, commentableId?: string | null, companyId?: string | null, personId?: string | null }> | null }> };
 
 export type GetActivityQueryVariables = Exact<{
   activityId: Scalars['String'];
 }>;
 
 
-export type GetActivityQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, body?: string | null, title?: string | null, type: ActivityType, completedAt?: string | null, dueAt?: string | null, assignee?: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string, avatarUrl?: string | null } | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null }> };
+export type GetActivityQuery = { __typename?: 'Query', findManyActivities: Array<{ __typename?: 'Activity', id: string, createdAt: string, body?: string | null, title?: string | null, type: ActivityType, completedAt?: string | null, dueAt?: string | null, assignee?: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string, avatarUrl?: string | null } | null, author: { __typename?: 'User', id: string, firstName?: string | null, lastName?: string | null, displayName: string }, comments?: Array<{ __typename?: 'Comment', id: string, body: string, createdAt: string, updatedAt: string, author: { __typename?: 'User', id: string, displayName: string, firstName?: string | null, lastName?: string | null, avatarUrl?: string | null } }> | null, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, commentableType?: CommentableType | null, commentableId?: string | null, companyId?: string | null, personId?: string | null }> | null }> };
 
 export type AddActivityTargetsOnActivityMutationVariables = Exact<{
   activityId: Scalars['String'];
@@ -2350,7 +2350,7 @@ export type AddActivityTargetsOnActivityMutationVariables = Exact<{
 }>;
 
 
-export type AddActivityTargetsOnActivityMutation = { __typename?: 'Mutation', updateOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null } };
+export type AddActivityTargetsOnActivityMutation = { __typename?: 'Mutation', updateOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, commentableType?: CommentableType | null, commentableId?: string | null, companyId?: string | null, personId?: string | null }> | null } };
 
 export type RemoveActivityTargetsOnActivityMutationVariables = Exact<{
   activityId: Scalars['String'];
@@ -2358,7 +2358,7 @@ export type RemoveActivityTargetsOnActivityMutationVariables = Exact<{
 }>;
 
 
-export type RemoveActivityTargetsOnActivityMutation = { __typename?: 'Mutation', updateOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, commentableType?: CommentableType | null, commentableId?: string | null }> | null } };
+export type RemoveActivityTargetsOnActivityMutation = { __typename?: 'Mutation', updateOneActivity: { __typename?: 'Activity', id: string, createdAt: string, updatedAt: string, activityTargets?: Array<{ __typename?: 'ActivityTarget', id: string, createdAt: string, updatedAt: string, commentableType?: CommentableType | null, commentableId?: string | null, companyId?: string | null, personId?: string | null }> | null } };
 
 export type DeleteActivityMutationVariables = Exact<{
   activityId: Scalars['String'];
@@ -2835,6 +2835,8 @@ export const CreateActivityDocument = gql`
       activityId
       commentableType
       commentableId
+      companyId
+      personId
     }
     comments {
       id
@@ -2923,6 +2925,8 @@ export const GetActivitiesByTargetsDocument = gql`
       id
       commentableType
       commentableId
+      companyId
+      personId
     }
   }
 }
@@ -2986,6 +2990,8 @@ export const GetActivitiesDocument = gql`
       id
       commentableType
       commentableId
+      companyId
+      personId
     }
   }
 }
@@ -3059,6 +3065,8 @@ export const GetActivityDocument = gql`
       id
       commentableType
       commentableId
+      companyId
+      personId
     }
   }
 }
@@ -3106,6 +3114,8 @@ export const AddActivityTargetsOnActivityDocument = gql`
       updatedAt
       commentableType
       commentableId
+      companyId
+      personId
     }
   }
 }
@@ -3152,6 +3162,8 @@ export const RemoveActivityTargetsOnActivityDocument = gql`
       updatedAt
       commentableType
       commentableId
+      companyId
+      personId
     }
   }
 }
diff --git a/front/src/modules/activities/hooks/useHandleCheckableActivityTargetChange.ts b/front/src/modules/activities/hooks/useHandleCheckableActivityTargetChange.ts
index 5814ee2a491..8c10b39be18 100644
--- a/front/src/modules/activities/hooks/useHandleCheckableActivityTargetChange.ts
+++ b/front/src/modules/activities/hooks/useHandleCheckableActivityTargetChange.ts
@@ -6,6 +6,7 @@ import { GET_PEOPLE } from '@/people/queries';
 import {
   Activity,
   ActivityTarget,
+  CommentableType,
   useAddActivityTargetsOnActivityMutation,
   useRemoveActivityTargetsOnActivityMutation,
 } from '~/generated/graphql';
@@ -65,6 +66,10 @@ export function useHandleCheckableActivityTargetChange({
             createdAt: new Date().toISOString(),
             commentableType: entity.entityType,
             commentableId: entity.id,
+            companyId:
+              entity.entityType === CommentableType.Company ? entity.id : null,
+            personId:
+              entity.entityType === CommentableType.Person ? entity.id : null,
           })),
         },
       });
diff --git a/front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts b/front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
index fd342a7d07c..173a9621d1b 100644
--- a/front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
+++ b/front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
@@ -9,7 +9,11 @@ import { useRightDrawer } from '@/ui/right-drawer/hooks/useRightDrawer';
 import { RightDrawerHotkeyScope } from '@/ui/right-drawer/types/RightDrawerHotkeyScope';
 import { RightDrawerPages } from '@/ui/right-drawer/types/RightDrawerPages';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
-import { ActivityType, useCreateActivityMutation } from '~/generated/graphql';
+import {
+  ActivityType,
+  CommentableType,
+  useCreateActivityMutation,
+} from '~/generated/graphql';
 
 import { GET_ACTIVITIES_BY_TARGETS, GET_ACTIVITY } from '../queries';
 import { commentableEntityArrayState } from '../states/commentableEntityArrayState';
@@ -41,6 +45,9 @@ export function useOpenCreateActivityDrawer() {
           {
             commentableId: entity.id,
             commentableType: entity.type,
+            companyId:
+              entity.type === CommentableType.Company ? entity.id : null,
+            personId: entity.type === CommentableType.Person ? entity.id : null,
             id: v4(),
             createdAt: new Date().toISOString(),
           },
diff --git a/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts b/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
index 2efd68ea34e..8ebaa7f74d4 100644
--- a/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
+++ b/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
@@ -54,6 +54,8 @@ export function useOpenCreateActivityDrawerForSelectedRowIds() {
         activityTargetArray: commentableEntityArray.map((entity) => ({
           commentableId: entity.id,
           commentableType: entity.type,
+          companyId: entity.type === CommentableType.Company ? entity.id : null,
+          personId: entity.type === CommentableType.Person ? entity.id : null,
           id: v4(),
           createdAt: new Date().toISOString(),
         })),
diff --git a/front/src/modules/activities/queries/create.ts b/front/src/modules/activities/queries/create.ts
index f7c3aea375e..2c1365f8e0f 100644
--- a/front/src/modules/activities/queries/create.ts
+++ b/front/src/modules/activities/queries/create.ts
@@ -68,6 +68,8 @@ export const CREATE_ACTIVITY_WITH_COMMENT = gql`
         activityId
         commentableType
         commentableId
+        companyId
+        personId
       }
       comments {
         id
diff --git a/front/src/modules/activities/queries/select.ts b/front/src/modules/activities/queries/select.ts
index 821ee602e3d..c7acc033d61 100644
--- a/front/src/modules/activities/queries/select.ts
+++ b/front/src/modules/activities/queries/select.ts
@@ -48,6 +48,8 @@ export const GET_ACTIVITIES_BY_TARGETS = gql`
         id
         commentableType
         commentableId
+        companyId
+        personId
       }
     }
   }
@@ -86,6 +88,8 @@ export const GET_ACTIVITIES = gql`
         id
         commentableType
         commentableId
+        companyId
+        personId
       }
     }
   }
@@ -131,6 +135,8 @@ export const GET_ACTIVITY = gql`
         id
         commentableType
         commentableId
+        companyId
+        personId
       }
     }
   }
diff --git a/front/src/modules/activities/queries/update.ts b/front/src/modules/activities/queries/update.ts
index 50900d3bd8b..f136dd41bbb 100644
--- a/front/src/modules/activities/queries/update.ts
+++ b/front/src/modules/activities/queries/update.ts
@@ -18,6 +18,8 @@ export const ADD_ACTIVITY_TARGETS = gql`
         updatedAt
         commentableType
         commentableId
+        companyId
+        personId
       }
     }
   }
@@ -43,6 +45,8 @@ export const REMOVE_ACTIVITY_TARGETS = gql`
         updatedAt
         commentableType
         commentableId
+        companyId
+        personId
       }
     }
   }