diff --git a/packages/server/lib/forex.js b/packages/server/lib/forex.js
index dc71bef7..c620e651 100644
--- a/packages/server/lib/forex.js
+++ b/packages/server/lib/forex.js
@@ -30,7 +30,7 @@ function getBitPayFxRate(
   fiatCodeProperty,
   rateProperty,
 ) {
-  return getFiatRates().then(({ data: fxRates }) => {
+  return getFiatRates().then(fxRates => {
     const defaultFiatRate = findCurrencyRates(
       fxRates,
       defaultFiatMarket,
@@ -69,14 +69,15 @@ const getRate = (retries = 1, fiatCode, defaultFiatMarket) => {
     defaultFiatMarket,
     fiatCodeProperty,
     rateProperty,
-  ).catch(() => {
-    // Switch service
+  ).catch(err => {
     const erroredService = API_QUEUE.shift()
     API_QUEUE.push(erroredService)
     if (retries >= MAX_ROTATIONS)
-      throw new Error(`FOREX API error from ${erroredService.name}`)
+      throw new Error(
+        `FOREX API error from ${erroredService.name} ${err?.message}`,
+      )
 
-    return getRate(++retries, fiatCode)
+    return getRate(++retries, fiatCode, defaultFiatMarket)
   })
 }
 
diff --git a/packages/server/lib/plugins/ticker/ccxt.js b/packages/server/lib/plugins/ticker/ccxt.js
index 7316d61d..79431299 100644
--- a/packages/server/lib/plugins/ticker/ccxt.js
+++ b/packages/server/lib/plugins/ticker/ccxt.js
@@ -34,7 +34,7 @@ function ticker(fiatCode, cryptoCode, tickerName) {
     return getCurrencyRates(ticker, fiatCode, cryptoCode)
   }
 
-  return getRate(RETRIES, tickerName, defaultFiatMarket(tickerName)).then(
+  return getRate(RETRIES, fiatCode, defaultFiatMarket(tickerName)).then(
     ({ fxRate }) => {
       try {
         return getCurrencyRates(