diff --git a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
index 375a40173..841dfe3e0 100644
--- a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
+++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
@@ -363,7 +363,11 @@ export class ExchangeRateDataService {
       )}`
     );
 
-    return undefined;
+    Logger.warn(
+      `No exchange rate data found for ${aFromCurrency} -> ${aToCurrency} on ${aDate.toISOString()}, returning original value as fallback`,
+      'ExchangeRateDataService'
+    );
+    return aValue;
   }
 
   private async getExchangeRates({