diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
index 5cd848ef7..fabdbc1ae 100644
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
@@ -281,7 +281,10 @@ export abstract class PortfolioCalculator {
     } = await this.currentRateService.getValues({
       dataGatheringItems,
       dateQuery: {
-        gte: parseDate(firstTransactionPoint?.date),
+        // TODO: Improve?
+        gte: firstTransactionPoint?.date
+          ? parseDate(firstTransactionPoint.date)
+          : endDate,
         lt: endDate
       }
     });