diff --git a/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts b/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts
index bef127ca41..8bdc9307bc 100644
--- a/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts
+++ b/apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts
@@ -53,7 +53,8 @@ export class EmergencyFundCoverage extends Rule<Settings> {
     const placeholders = {
       baseCurrency: ruleSettings.baseCurrency,
       emergencyFund: this.emergencyFundInBaseCurrency.toLocaleString(
-        ruleSettings.locale
+        ruleSettings.locale,
+        { useGrouping: true }
       )
     };
 
diff --git a/apps/api/src/models/rules/liquidity/buying-power.ts b/apps/api/src/models/rules/liquidity/buying-power.ts
index b22654cfe9..0ad6ac0a0f 100644
--- a/apps/api/src/models/rules/liquidity/buying-power.ts
+++ b/apps/api/src/models/rules/liquidity/buying-power.ts
@@ -44,7 +44,8 @@ export class BuyingPower extends Rule<Settings> {
           placeholders: {
             baseCurrency: ruleSettings.baseCurrency,
             thresholdMin: ruleSettings.thresholdMin.toLocaleString(
-              ruleSettings.locale
+              ruleSettings.locale,
+              { useGrouping: true }
             )
           }
         }),
@@ -59,7 +60,8 @@ export class BuyingPower extends Rule<Settings> {
         placeholders: {
           baseCurrency: ruleSettings.baseCurrency,
           thresholdMin: ruleSettings.thresholdMin.toLocaleString(
-            ruleSettings.locale
+            ruleSettings.locale,
+            { useGrouping: true }
           )
         }
       }),
diff --git a/libs/common/src/lib/chart-helper.ts b/libs/common/src/lib/chart-helper.ts
index bad13d0bac..72b629556a 100644
--- a/libs/common/src/lib/chart-helper.ts
+++ b/libs/common/src/lib/chart-helper.ts
@@ -123,7 +123,8 @@ export function getTooltipOptions<T extends ChartType>({
           if (currency) {
             label += `${yPoint.toLocaleString(locale, {
               maximumFractionDigits: 2,
-              minimumFractionDigits: 2
+              minimumFractionDigits: 2,
+              useGrouping: true
             })} ${currency}`;
           } else if (unit) {
             label += `${yPoint.toFixed(2)} ${unit}`;
diff --git a/libs/ui/src/lib/line-chart/line-chart.component.ts b/libs/ui/src/lib/line-chart/line-chart.component.ts
index 782d987856..e6f1b9b2e2 100644
--- a/libs/ui/src/lib/line-chart/line-chart.component.ts
+++ b/libs/ui/src/lib/line-chart/line-chart.component.ts
@@ -258,7 +258,8 @@ export class GfLineChartComponent
                       if (typeof tickValue === 'number') {
                         return tickValue.toLocaleString(this.locale, {
                           maximumFractionDigits: 2,
-                          minimumFractionDigits: 2
+                          minimumFractionDigits: 2,
+                          useGrouping: true
                         });
                       }
 
diff --git a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
index e27097a701..b837d887b7 100644
--- a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
+++ b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
@@ -496,7 +496,8 @@ export class GfPortfolioProportionChartComponent
               `${name ?? symbol}`,
               `${value.toLocaleString(this.locale, {
                 maximumFractionDigits: 2,
-                minimumFractionDigits: 2
+                minimumFractionDigits: 2,
+                useGrouping: true
               })} ${this.baseCurrency ?? ''} (${percentage.toFixed(2)}%)`
             ];
           }
diff --git a/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts b/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
index 11c7edbf63..0046ffff54 100644
--- a/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
+++ b/libs/ui/src/lib/treemap-chart/treemap-chart.component.ts
@@ -324,6 +324,7 @@ export class GfTreemapChartComponent
                 ).toLocaleString(this.locale(), {
                   maximumFractionDigits: 2,
                   minimumFractionDigits: 2,
+                  useGrouping: true,
                   signDisplay: 'exceptZero'
                 })}%`
               ];
@@ -401,7 +402,8 @@ export class GfTreemapChartComponent
             raw._data.allocationInPercentage * 100
           ).toLocaleString(this.locale(), {
             maximumFractionDigits: 2,
-            minimumFractionDigits: 2
+            minimumFractionDigits: 2,
+            useGrouping: true
           })}%`;
           const name = getHoldingName(raw._data.assetProfile);
 
@@ -410,6 +412,7 @@ export class GfTreemapChartComponent
           ).toLocaleString(this.locale(), {
             maximumFractionDigits: 2,
             minimumFractionDigits: 2,
+            useGrouping: true,
             signDisplay: 'exceptZero'
           })}%`;
 
@@ -420,7 +423,8 @@ export class GfTreemapChartComponent
               `${name} (${allocationInPercentage})`,
               `${value?.toLocaleString(this.locale(), {
                 maximumFractionDigits: 2,
-                minimumFractionDigits: 2
+                minimumFractionDigits: 2,
+                useGrouping: true
               })} ${this.baseCurrency()}`,
               '',
               $localize`Change` + ' (' + $localize`Performance` + ')',
@@ -429,7 +433,8 @@ export class GfTreemapChartComponent
                 {
                   maximumFractionDigits: 2,
                   minimumFractionDigits: 2,
-                  signDisplay: 'exceptZero'
+                  signDisplay: 'exceptZero',
+                  useGrouping: true
                 }
               )} ${this.baseCurrency()} (${netPerformanceInPercentageWithSign})`
             ];
diff --git a/libs/ui/src/lib/value/value.component.ts b/libs/ui/src/lib/value/value.component.ts
index dfbe461f60..e69548e1ee 100644
--- a/libs/ui/src/lib/value/value.component.ts
+++ b/libs/ui/src/lib/value/value.component.ts
@@ -83,7 +83,8 @@ export class GfValueComponent implements AfterViewInit, OnChanges, OnDestroy {
 
     return {
       maximumFractionDigits: digits,
-      minimumFractionDigits: digits
+      minimumFractionDigits: digits,
+      useGrouping: true
     };
   });