diff --git a/src/bridge/EthereumJSBridge.js b/src/bridge/EthereumJSBridge.js
index f9f8e8a0..5ffbad18 100644
--- a/src/bridge/EthereumJSBridge.js
+++ b/src/bridge/EthereumJSBridge.js
@@ -234,7 +234,8 @@ const EthereumBridge: WalletBridge<Transaction> = {
           complete()
         } else {
           operations = operations.filter(
-            o => !o.blockHeight || blockHeight - o.blockHeight < SAFE_REORG_THRESHOLD,
+            // only keep operations that have enough confirmations
+            o => o.blockHeight && blockHeight - o.blockHeight > SAFE_REORG_THRESHOLD,
           )
           const blockHash = operations.length > 0 ? operations[0].blockHash : undefined
           const { txs } = await api.getTransactions(freshAddress, blockHash)
diff --git a/src/helpers/countervalues.js b/src/helpers/countervalues.js
index e893d141..72a6a0c5 100644
--- a/src/helpers/countervalues.js
+++ b/src/helpers/countervalues.js
@@ -20,7 +20,7 @@ const pairsSelector = createSelector(
     [
       { from: intermediaryCurrency, to: counterValueCurrency, exchange: counterValueExchange },
     ].concat(
-      currencies.map(currency => ({
+      currencies.filter(c => c !== intermediaryCurrency).map(currency => ({
         from: currency,
         to: intermediaryCurrency,
         exchange: currencySettingsSelector(state, { currency }).exchange,