diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts
index 89915f295..f02f84d66 100644
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@@ -346,13 +346,14 @@ export class OrderService {
 
     for (const account of cashDetails.accounts) {
       const { balances } = await this.accountBalanceService.getAccountBalances({
-        filters: [{ id: account.id, type: 'ACCOUNT' }],
         userCurrency,
-        userId
+        userId,
+        filters: [{ id: account.id, type: 'ACCOUNT' }]
       });
 
       let currentBalance = 0;
       let currentBalanceInBaseCurrency = 0;
+
       for (const balanceItem of balances) {
         const syntheticActivityTemplate: Activity = {
           userId,
@@ -414,6 +415,7 @@ export class OrderService {
               currentBalanceInBaseCurrency - balanceItem.valueInBaseCurrency
           });
         }
+
         currentBalance = balanceItem.value;
         currentBalanceInBaseCurrency = balanceItem.valueInBaseCurrency;
       }
diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
index 6c16efbca..d2b3c0625 100644
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
@@ -136,15 +136,12 @@ export abstract class PortfolioCalculator {
           }
 
           return {
+            SymbolProfile,
             tags,
             type,
             date: format(date, DATE_FORMAT),
             fee: new Big(feeInAssetProfileCurrency),
             quantity: new Big(quantity),
-            SymbolProfile: {
-              ...SymbolProfile,
-              assetSubClass: SymbolProfile.assetSubClass
-            },
             unitPrice: new Big(unitPriceInAssetProfileCurrency)
           };
         }
diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts
index 738ba8446..070d7543b 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts
@@ -298,9 +298,9 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
       itemType: 'start',
       quantity: new Big(0),
       SymbolProfile: {
-        assetSubClass: isCash ? 'CASH' : undefined,
         dataSource,
-        symbol
+        symbol,
+        assetSubClass: isCash ? 'CASH' : undefined
       },
       type: 'BUY',
       unitPrice: unitPriceAtStartDate
@@ -312,9 +312,9 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
       feeInBaseCurrency: new Big(0),
       itemType: 'end',
       SymbolProfile: {
-        assetSubClass: isCash ? 'CASH' : undefined,
         dataSource,
-        symbol
+        symbol,
+        assetSubClass: isCash ? 'CASH' : undefined
       },
       quantity: new Big(0),
       type: 'BUY',
@@ -353,9 +353,9 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
           feeInBaseCurrency: new Big(0),
           quantity: new Big(0),
           SymbolProfile: {
-            assetSubClass: isCash ? 'CASH' : undefined,
             dataSource,
-            symbol
+            symbol,
+            assetSubClass: isCash ? 'CASH' : undefined
           },
           type: 'BUY',
           unitPrice: marketSymbolMap[dateString]?.[symbol] ?? lastUnitPrice,