diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
index 81095b511..bf5ac055d 100644
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
@@ -711,7 +711,7 @@ export abstract class PortfolioCalculator {
     return this.snapshot.totalLiabilitiesWithCurrencyEffect;
   }
 
-  public async getPerformance({ data }: { data: HistoricalDataItem[] }) {
+  public getPerformance({ data }: { data: HistoricalDataItem[] }) {
     const chart: HistoricalDataItem[] = [];
 
     let netPerformanceAtStartDate: number;
@@ -771,7 +771,7 @@ export abstract class PortfolioCalculator {
     return { chart };
   }
 
-  public async getPerformanceByGroup({
+  public getPerformanceByGroup({
     data,
     groupBy
   }: {
@@ -784,7 +784,7 @@ export abstract class PortfolioCalculator {
       const dataByYear = ldGroupBy(data, (item) => item.date.slice(0, 4));
 
       for (const year of Object.keys(dataByYear)) {
-        const { chart: yearChart } = await this.getPerformance({
+        const { chart: yearChart } = this.getPerformance({
           data: Object.values(dataByYear[year])
         });
 
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts
index 71eda96f5..7f6bd3623 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts
@@ -138,12 +138,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('595.6'),
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
index 299aa639f..7eea1b609 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
@@ -154,12 +154,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('0'),
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts
index c42bcf05e..d952ed709 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts
@@ -138,12 +138,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('0'),
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts
index 5d5f2acc5..f0d4ae491 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts
@@ -128,12 +128,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('297.8'),
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts
index 64a65b75c..c6ac9e3e3 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts
@@ -137,12 +137,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot.historicalData[0]).toEqual({
         date: '2021-12-11',
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
index bcbb60c57..a61e0a62d 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
@@ -151,12 +151,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('13298.425356'),
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts
index 024f24e0e..406792ba7 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts
@@ -137,12 +137,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot.historicalData[0]).toEqual({
         date: '2021-12-11',
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts
index 961d59d60..8374e4a8e 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts
@@ -134,12 +134,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('103.10483'),
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.ts
index 725b26339..9d49f5c9e 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.ts
@@ -134,12 +134,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('0'),
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts
index 42730cb6e..2dc3bd56c 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-orders.spec.ts
@@ -98,12 +98,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big(0),
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
index ac2f7184a..8e20b03e6 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
@@ -134,12 +134,10 @@ describe('PortfolioCalculator', () => {
         groupBy: 'year'
       });
 
-      const performanceByYear = await portfolioCalculator.getPerformanceByGroup(
-        {
-          data: portfolioSnapshot.historicalData,
-          groupBy: 'year'
-        }
-      );
+      const performanceByYear = portfolioCalculator.getPerformanceByGroup({
+        data: portfolioSnapshot.historicalData,
+        groupBy: 'year'
+      });
 
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big('87.8'),
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 5b22fa187..103d95a7a 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1055,18 +1055,19 @@ export class PortfolioService {
       return !isBefore(date, startDate) && !isAfter(date, endDate);
     });
 
-    const { chart: intervalChart } = await portfolioCalculator.getPerformance({
+    const { chart: intervalChart } = portfolioCalculator.getPerformance({
       data: items
     });
 
     let chart = intervalChart;
 
     if (groupBy) {
-      const { chart: groupedChart } =
-        await portfolioCalculator.getPerformanceByGroup({
+      const { chart: groupedChart } = portfolioCalculator.getPerformanceByGroup(
+        {
           data: items,
           groupBy
-        });
+        }
+      );
 
       chart = groupedChart;
     }