diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
index 3406d1b8a..c5ed98543 100644
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
@@ -339,7 +339,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
       const datesWithOrders = {};
 
       for (const { date, type } of orders) {
-        if (['BUY', 'SELL'].includes(type)) {
+        if (['BUY', 'SELL', 'STAKE'].includes(type)) {
           datesWithOrders[date] = true;
         }
       }
@@ -459,7 +459,7 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
       }
 
       if (order.type === 'STAKE') {
-        order.unitPrice = marketSymbolMap[order.date]?.[symbol];
+        order.unitPrice = marketSymbolMap[order.date]?.[symbol] ?? new Big(0);
       }
 
       if (order.unitPrice) {
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 82b775c40..feea4c67e 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1817,7 +1817,7 @@ export class PortfolioService {
       cashDetailsWithExcludedAccounts.balanceInBaseCurrency
     ).minus(balanceInBaseCurrency);
 
-    excludedAccountsAndActivities = excludedBalanceInBaseCurrency
+    let excludedAccountsAndActivities = excludedBalanceInBaseCurrency
       .plus(totalOfExcludedActivities)
       .toNumber();