diff --git a/wallet/src/de/schildbach/wallet/rates/ExchangeRatesRepository.kt b/wallet/src/de/schildbach/wallet/rates/ExchangeRatesRepository.kt
index 90073fdfd2..45671236b5 100644
--- a/wallet/src/de/schildbach/wallet/rates/ExchangeRatesRepository.kt
+++ b/wallet/src/de/schildbach/wallet/rates/ExchangeRatesRepository.kt
@@ -194,10 +194,11 @@ class ExchangeRatesRepository @Inject constructor(
             } else {
                 false
             }
+            val retrievalError = config.get(EXCHANGE_RATES_RETRIEVAL_FAILURE) ?: false
             RateRetrievalState(
-                config.get(EXCHANGE_RATES_RETRIEVAL_FAILURE) ?: false,
+                retrievalError,
                 staleRate,
-                volatile
+                if (retrievalError || staleRate) false else volatile
             )
         }
         .catch {