diff --git a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
index 0ef622c42..930e0c7f1 100644
--- a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
@@ -33,6 +33,10 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
       symbol = `${DEFAULT_CURRENCY}${symbol}`;
     }
 
+    if (symbol.includes(`${DEFAULT_CURRENCY}ZAC`)) {
+      symbol = `${DEFAULT_CURRENCY}ZAc`;
+    }
+
     return symbol.replace('=X', '');
   }
 
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 d180d8dd2..9f5130183 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
@@ -136,24 +136,20 @@ export class ExchangeRateDataService {
       getYesterday()
     );
 
-    if (Object.keys(result).length !== this.currencyPairs.length) {
-      // Load currencies directly from data provider as a fallback
-      // if historical data is not fully available
-      const quotes = await this.dataProviderService.getQuotes({
-        items: this.currencyPairs.map(({ dataSource, symbol }) => {
-          return { dataSource, symbol };
-        }),
-        requestTimeout: ms('30 seconds')
-      });
+    const quotes = await this.dataProviderService.getQuotes({
+      items: this.currencyPairs.map(({ dataSource, symbol }) => {
+        return { dataSource, symbol };
+      }),
+      requestTimeout: ms('30 seconds')
+    });
 
-      for (const symbol of Object.keys(quotes)) {
-        if (isNumber(quotes[symbol].marketPrice)) {
-          result[symbol] = {
-            [format(getYesterday(), DATE_FORMAT)]: {
-              marketPrice: quotes[symbol].marketPrice
-            }
-          };
-        }
+    for (const symbol of Object.keys(quotes)) {
+      if (isNumber(quotes[symbol].marketPrice)) {
+        result[symbol] = {
+          [format(getYesterday(), DATE_FORMAT)]: {
+            marketPrice: quotes[symbol].marketPrice
+          }
+        };
       }
     }