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 8b76ae86b..54167bc5b 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
@@ -63,7 +63,8 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
       if (
         isCurrency(
           aSymbol.substring(0, aSymbol.length - DEFAULT_CURRENCY.length)
-        )
+        ) &&
+        isCurrency(aSymbol.substring(aSymbol.length - DEFAULT_CURRENCY.length))
       ) {
         return `${aSymbol}=X`;
       } else if (