diff --git a/apps/web/components/map/panels/toolbox/tools/aggregate/Aggregate.tsx b/apps/web/components/map/panels/toolbox/tools/aggregate/Aggregate.tsx
index 2c20a5f..37f8575 100644
--- a/apps/web/components/map/panels/toolbox/tools/aggregate/Aggregate.tsx
+++ b/apps/web/components/map/panels/toolbox/tools/aggregate/Aggregate.tsx
@@ -106,11 +106,13 @@ const Aggregate = ({ onBack, onClose, type }: AggregateProps) => {
     setStatisticField,
   } = useStatisticValues();
 
-  const { layerFields: allSourceLayerFields } = useLayerFields(
+  const { layerFields: statisticLayerFields } = useLayerFields(
     sourceLayerDatasetId || "",
     statisticMethodSelected?.value === "count" ? undefined : "number"
   );
 
+  const { layerFields: allSourceLayerFields } = useLayerFields(sourceLayerDatasetId || "");
+
   const isValid = useMemo(() => {
     if (
       (areaType?.value === areaTypeEnum.Enum.feature && !selectedAreaLayer) ||
@@ -322,7 +324,7 @@ const Aggregate = ({ onBack, onClose, type }: AggregateProps) => {
                       tooltip={t("select_statistic_method_tooltip")}
                     />
                     <LayerFieldSelector
-                      fields={allSourceLayerFields}
+                      fields={statisticLayerFields}
                       selectedField={statisticField}
                       disabled={!statisticMethodSelected}
                       setSelectedField={(field) => {