diff --git a/centrifuge-app/src/components/Charts/CashflowsChart.tsx b/centrifuge-app/src/components/Charts/CashflowsChart.tsx
index fb1cbfaae..957cdbd6e 100644
--- a/centrifuge-app/src/components/Charts/CashflowsChart.tsx
+++ b/centrifuge-app/src/components/Charts/CashflowsChart.tsx
@@ -45,10 +45,10 @@ export const CashflowsChart = ({ poolStates, pool }: Props) => {
           pool.currency.decimals
         ).toFloat()
 
-        const interest = new CurrencyBalance(day.sumInterestRepaidAmountByPeriod, pool.currency.decimals).toFloat()
-        const fees =
-          new CurrencyBalance(day.sumPoolFeesChargedAmountByPeriod ?? 0, pool.currency.decimals).toFloat() +
-          new CurrencyBalance(day.sumPoolFeesAccruedAmountByPeriod ?? 0, pool.currency.decimals).toFloat()
+        const interest =
+          new CurrencyBalance(day.sumInterestRepaidAmountByPeriod, pool.currency.decimals).toFloat() +
+          new CurrencyBalance(day.sumUnscheduledRepaidAmountByPeriod, pool.currency.decimals).toFloat()
+        const fees = new CurrencyBalance(day.sumPoolFeesPaidAmountByPeriod ?? 0, pool.currency.decimals).toFloat()
         return { name: new Date(day.timestamp), purchases, principalRepayments, interest, fees }
       }) || [],
     [poolStates, pool.currency.decimals]