diff --git a/apps/api/src/app/core/current-rate.service.ts b/apps/api/src/app/core/current-rate.service.ts
index 6e7a0e202..7cab79808 100644
--- a/apps/api/src/app/core/current-rate.service.ts
+++ b/apps/api/src/app/core/current-rate.service.ts
@@ -79,13 +79,13 @@ export class CurrentRateService {
           const result = [];
           for (const symbol of symbols) {
             result.push({
+              symbol,
               date: today,
               marketPrice: this.exchangeRateDataService.toCurrency(
                 dataResultProvider?.[symbol]?.marketPrice ?? 0,
                 dataResultProvider?.[symbol]?.currency,
                 userCurrency
-              ),
-              symbol: symbol
+              )
             });
           }
           return result;
diff --git a/apps/api/src/app/core/portfolio-calculator.ts b/apps/api/src/app/core/portfolio-calculator.ts
index ebfbc3803..de62ec597 100644
--- a/apps/api/src/app/core/portfolio-calculator.ts
+++ b/apps/api/src/app/core/portfolio-calculator.ts
@@ -300,8 +300,8 @@ export class PortfolioCalculator {
 
     return {
       ...overall,
-      hasErrors: hasErrors || overall.hasErrors,
-      positions
+      positions,
+      hasErrors: hasErrors || overall.hasErrors
     };
   }
 
@@ -426,11 +426,11 @@ export class PortfolioCalculator {
     }
     return {
       currentValue,
-      totalInvestment,
       grossPerformance,
+      hasErrors,
+      totalInvestment,
       grossPerformancePercentage:
-        grossPerformancePercentage.div(completeInitialValue),
-      hasErrors
+        grossPerformancePercentage.div(completeInitialValue)
     };
   }