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 9a87af153..7090e346b 100644
--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts
@@ -636,8 +636,10 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
 
       if (totalUnits.eq(0)) {
         // Reset tracking variables when position is fully closed
+        totalInvestment = new Big(0);
         totalInvestmentFromBuyTransactions = new Big(0);
         totalInvestmentFromBuyTransactionsWithCurrencyEffect = new Big(0);
+        totalInvestmentWithCurrencyEffect = new Big(0);
         totalQuantityFromBuyTransactions = new Big(0);
       }