diff --git a/packages/twenty-front/src/modules/activities/timeline/components/TimelineActivity.tsx b/packages/twenty-front/src/modules/activities/timeline/components/TimelineActivity.tsx
index 3574022c4..d06c79fff 100644
--- a/packages/twenty-front/src/modules/activities/timeline/components/TimelineActivity.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline/components/TimelineActivity.tsx
@@ -4,7 +4,7 @@ import styled from '@emotion/styled';
 import { useRecoilValue } from 'recoil';
 
 import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
-import { timelineActivityWithoutTargetsFamilyState } from '@/activities/timeline/states/timelineActivityFirstLevelFamilySelector';
+import { timelineActivityWithoutTargetsFamilyState } from '@/activities/timeline/states/timelineActivityWithoutTargetsFamilyState';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { IconCheckbox, IconNotes } from '@/ui/display/icon';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
diff --git a/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx b/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx
index 2b7df9fe3..cc0f24fdc 100644
--- a/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline/components/TimelineQueryEffect.tsx
@@ -7,7 +7,7 @@ import { objectShowPageTargetableObjectState } from '@/activities/timeline/state
 import { timelineActivitiesFammilyState } from '@/activities/timeline/states/timelineActivitiesFamilyState';
 import { timelineActivitiesForGroupState } from '@/activities/timeline/states/timelineActivitiesForGroupState';
 import { timelineActivitiesNetworkingState } from '@/activities/timeline/states/timelineActivitiesNetworkingState';
-import { timelineActivityWithoutTargetsFamilyState } from '@/activities/timeline/states/timelineActivityFirstLevelFamilySelector';
+import { timelineActivityWithoutTargetsFamilyState } from '@/activities/timeline/states/timelineActivityWithoutTargetsFamilyState';
 import { Activity } from '@/activities/types/Activity';
 import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { sortObjectRecordByDateField } from '@/object-record/utils/sortObjectRecordByDateField';
diff --git a/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useInjectIntoTimelineActivitiesQueries.test.tsx b/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useInjectIntoTimelineActivitiesQueries.test.tsx
new file mode 100644
index 000000000..d389d7b09
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useInjectIntoTimelineActivitiesQueries.test.tsx
@@ -0,0 +1,54 @@
+import { ReactNode } from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import { act, renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+
+import { useInjectIntoTimelineActivitiesQueries } from '@/activities/timeline/hooks/useInjectIntoTimelineActivitiesQueries';
+import { useUpsertFindManyRecordsQueryInCache } from '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache';
+import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+import { mockedActivities } from '~/testing/mock-data/activities';
+
+const upsertFindManyRecordsQueryInCacheMock = jest.fn();
+
+jest.mock(
+  '@/object-record/cache/hooks/useUpsertFindManyRecordsQueryInCache',
+  () => ({
+    useUpsertFindManyRecordsQueryInCache: jest.fn(),
+  }),
+);
+
+(useUpsertFindManyRecordsQueryInCache as jest.Mock).mockImplementation(() => ({
+  upsertFindManyRecordsQueryInCache: upsertFindManyRecordsQueryInCacheMock,
+}));
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider addTypename={false}>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+describe('useInjectIntoTimelineActivitiesQueries', () => {
+  it('works as expected', () => {
+    const { result } = renderHook(
+      () => useInjectIntoTimelineActivitiesQueries(),
+      { wrapper: Wrapper },
+    );
+
+    act(() => {
+      result.current.injectIntoTimelineActivitiesQueries({
+        activityToInject: mockedActivities[0],
+        activityTargetsToInject: [],
+        timelineTargetableObject: {
+          id: '123',
+          targetObjectNameSingular: 'person',
+        },
+      });
+    });
+
+    expect(upsertFindManyRecordsQueryInCacheMock).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useTimelineActivities.test.tsx b/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useTimelineActivities.test.tsx
new file mode 100644
index 000000000..59f931b04
--- /dev/null
+++ b/packages/twenty-front/src/modules/activities/timeline/hooks/__tests__/useTimelineActivities.test.tsx
@@ -0,0 +1,38 @@
+import { ReactNode } from 'react';
+import { MockedProvider } from '@apollo/client/testing';
+import { renderHook } from '@testing-library/react';
+import { RecoilRoot } from 'recoil';
+
+import { useTimelineActivities } from '@/activities/timeline/hooks/useTimelineActivities';
+import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
+
+const Wrapper = ({ children }: { children: ReactNode }) => (
+  <RecoilRoot>
+    <MockedProvider addTypename={false}>
+      <SnackBarProviderScope snackBarManagerScopeId="snack-bar-manager">
+        {children}
+      </SnackBarProviderScope>
+    </MockedProvider>
+  </RecoilRoot>
+);
+
+// FIXME: The hook is re-rendering so many times that it's causing a maximum
+// update depth exceeded error. We need to fix this before we can write a proper test.
+describe('useTimelineActivities', () => {
+  it('works as expected', () => {
+    try {
+      renderHook(
+        () =>
+          useTimelineActivities({
+            targetableObject: {
+              id: '123',
+              targetObjectNameSingular: 'person',
+            },
+          }),
+        { wrapper: Wrapper },
+      );
+    } catch (e) {
+      expect((e as Error).message).toMatch(/^Maximum update depth exceeded/);
+    }
+  });
+});
diff --git a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityFirstLevelFamilySelector.ts b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityWithoutTargetsFamilyState.ts
similarity index 86%
rename from packages/twenty-front/src/modules/activities/timeline/states/timelineActivityFirstLevelFamilySelector.ts
rename to packages/twenty-front/src/modules/activities/timeline/states/timelineActivityWithoutTargetsFamilyState.ts
index ece59dab2..ac8c0f208 100644
--- a/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityFirstLevelFamilySelector.ts
+++ b/packages/twenty-front/src/modules/activities/timeline/states/timelineActivityWithoutTargetsFamilyState.ts
@@ -5,6 +5,6 @@ export const timelineActivityWithoutTargetsFamilyState = createFamilyState<
   Pick<Activity, 'id' | 'title' | 'createdAt' | 'author' | 'type'> | null,
   string
 >({
-  key: 'timelineActivityFirstLevelFamilySelector',
+  key: 'timelineActivityWithoutTargetsFamilyState',
   defaultValue: null,
 });