diff --git a/packages/twenty-front/src/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
index 5dd9c9b2845e..bf083a157e5a 100644
--- a/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
+++ b/packages/twenty-front/src/effect-components/PageChangeEffect.tsx
@@ -16,10 +16,10 @@ import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SettingsPath } from '@/types/SettingsPath';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
+import { useCleanRecoilState } from '~/hooks/useCleanRecoilState';
 import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
 import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
 import { isDefined } from '~/utils/isDefined';
-import { useCleanRecoilState } from '~/hooks/useCleanRecoilState';
 
 // TODO: break down into smaller functions and / or hooks
 //  - moved usePageChangeEffectNavigateLocation into dedicated hook
@@ -153,7 +153,10 @@ export const PageChangeEffect = () => {
         label: 'Create Task',
         type: CommandType.Create,
         Icon: IconCheckbox,
-        onCommandClick: () => openCreateActivity({ targetableObjects: [] }),
+        onCommandClick: () =>
+          openCreateActivity({
+            targetableObjects: [],
+          }),
       },
     ]);
   }, [addToCommandMenu, setToInitialCommandMenu, openCreateActivity]);
diff --git a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
index 74781c52cecd..400c1f398a95 100644
--- a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
@@ -68,24 +68,40 @@ export const useOpenCreateActivityDrawer = ({
       assigneeId: customAssignee?.id,
     });
 
-    const targetableObjectRelationIdName = `${targetableObjects[0].targetObjectNameSingular}Id`;
-
-    await createOneActivityTarget({
-      taskId:
-        activityObjectNameSingular === CoreObjectNameSingular.Task
-          ? activity.id
-          : undefined,
-      noteId:
-        activityObjectNameSingular === CoreObjectNameSingular.Note
-          ? activity.id
-          : undefined,
-      [targetableObjectRelationIdName]: targetableObjects[0].id,
-    });
+    if (targetableObjects.length > 0) {
+      const targetableObjectRelationIdName = `${targetableObjects[0].targetObjectNameSingular}Id`;
+
+      await createOneActivityTarget({
+        taskId:
+          activityObjectNameSingular === CoreObjectNameSingular.Task
+            ? activity.id
+            : undefined,
+        noteId:
+          activityObjectNameSingular === CoreObjectNameSingular.Note
+            ? activity.id
+            : undefined,
+        [targetableObjectRelationIdName]: targetableObjects[0].id,
+      });
+
+      setActivityTargetableEntityArray(targetableObjects);
+    } else {
+      await createOneActivityTarget({
+        taskId:
+          activityObjectNameSingular === CoreObjectNameSingular.Task
+            ? activity.id
+            : undefined,
+        noteId:
+          activityObjectNameSingular === CoreObjectNameSingular.Note
+            ? activity.id
+            : undefined,
+      });
+
+      setActivityTargetableEntityArray([]);
+    }
 
     setHotkeyScope(RightDrawerHotkeyScope.RightDrawer, { goto: false });
     setViewableRecordId(activity.id);
     setViewableRecordNameSingular(activityObjectNameSingular);
-    setActivityTargetableEntityArray(targetableObjects ?? []);
 
     openRightDrawer(RightDrawerPages.ViewRecord);
     setIsUpsertingActivityInDB(false);