diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts
index 78b4ea9d2..89915f295 100644
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@@ -737,24 +737,25 @@ export class OrderService {
     userCurrency: string;
     userId: string;
   }) {
+    const nonCashOrders = await this.getOrders({
+      filters,
+      userCurrency,
+      userId,
+      withExcludedAccountsAndActivities: false // TODO
+    });
+
     const cashDetails = await this.accountService.getCashDetails({
       filters,
       userId,
       currency: userCurrency
     });
+
     const cashOrders = await this.getCashOrders({
       cashDetails,
       userCurrency,
       userId
     });
 
-    const nonCashOrders = await this.getOrders({
-      filters,
-      userCurrency,
-      userId,
-      withExcludedAccountsAndActivities: false // TODO
-    });
-
     return {
       activities: [...nonCashOrders.activities, ...cashOrders.activities],
       count: nonCashOrders.count + cashOrders.count
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 1708bca0d..79afeefd0 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -487,7 +487,6 @@ export class PortfolioService {
       (user.settings?.settings as UserSettings)?.emergencyFund ?? 0
     );
 
-    // Activities for cash and non-cash assets
     const { activities } =
       await this.orderService.getOrdersForPortfolioCalculator({
         filters,
@@ -495,12 +494,6 @@ export class PortfolioService {
         userId
       });
 
-    const cashDetails = await this.accountService.getCashDetails({
-      filters,
-      userId,
-      currency: userCurrency
-    });
-
     const portfolioCalculator = this.calculatorFactory.createCalculator({
       activities,
       filters,
@@ -512,6 +505,12 @@ export class PortfolioService {
     const { createdAt, currentValueInBaseCurrency, hasErrors, positions } =
       await portfolioCalculator.getSnapshot();
 
+    const cashDetails = await this.accountService.getCashDetails({
+      filters,
+      userId,
+      currency: userCurrency
+    });
+
     const holdings: PortfolioDetails['holdings'] = {};
 
     const totalValueInBaseCurrency = currentValueInBaseCurrency.plus(