From 1decd40eea1464b6ebb8c96241e4abe0e707e564 Mon Sep 17 00:00:00 2001
From: Charles Bochet <charlesBochet@users.noreply.github.com>
Date: Thu, 5 Mar 2026 13:24:56 +0100
Subject: [PATCH] Remove unecessary queries for aggregate (#18421)

As per title.
---
 .../common-find-many-query-runner.service.ts              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
index 1b0010566f..7a19b2bba1 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
@@ -191,8 +191,12 @@ export class CommonFindManyQueryRunnerService extends CommonBaseQueryRunnerServi
       objectRecords.reverse();
     }
 
-    const parentObjectRecordsAggregatedValues =
-      await aggregateQueryBuilder.getRawOne();
+    const hasAggregatedFields =
+      Object.keys(args.selectedFieldsResult.aggregate ?? {}).length > 0;
+
+    const parentObjectRecordsAggregatedValues = hasAggregatedFields
+      ? await aggregateQueryBuilder.getRawOne()
+      : undefined;
 
     if (isDefined(args.selectedFieldsResult.relations)) {
       await this.processNestedRelationsHelper.processNestedRelations({