diff --git a/packages/twenty-front/src/modules/activities/hooks/useActivities.ts b/packages/twenty-front/src/modules/activities/hooks/useActivities.ts index d63109339..b5311a800 100644 --- a/packages/twenty-front/src/modules/activities/hooks/useActivities.ts +++ b/packages/twenty-front/src/modules/activities/hooks/useActivities.ts @@ -51,13 +51,12 @@ export const useActivities = ({ ), ]; + const skipBecauseNoActivityTargetFound = activityIds.length === 0; + const filter: RecordGqlOperationFilter = { - id: - targetableObjects.length > 0 - ? { - in: activityIds, - } - : undefined, + id: { + in: activityIds, + }, ...activitiesFilters, }; @@ -69,7 +68,7 @@ export const useActivities = ({ const { records: activities, loading: loadingActivities } = useFindManyRecords({ - skip: skip || loadingActivityTargets, + skip: skip || loadingActivityTargets || skipBecauseNoActivityTargetFound, objectNameSingular: FIND_ACTIVITIES_OPERATION_SIGNATURE.objectNameSingular, recordGqlFields: FIND_ACTIVITIES_OPERATION_SIGNATURE.fields,