diff --git a/new-lamassu-admin/src/pages/Wallet/helper.js b/new-lamassu-admin/src/pages/Wallet/helper.js
index d2a9bba3..20996fd1 100644
--- a/new-lamassu-admin/src/pages/Wallet/helper.js
+++ b/new-lamassu-admin/src/pages/Wallet/helper.js
@@ -27,14 +27,12 @@ const WalletSchema = Yup.object().shape({
 })
 
 const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => {
-  let currentCurrency = ''
   const widthAdjust = wizard ? 11 : 0
   const viewCryptoCurrency = it => {
     const currencyDisplay = R.compose(
       R.prop(['display']),
       R.find(R.propEq('code', it))
     )(cryptoCurrencies)
-    currentCurrency = currencyDisplay
     return currencyDisplay
   }
   const filterOptions = type => filterClass(type)(accounts || [])
@@ -49,12 +47,6 @@ const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => {
     filterCoins(it)(filterOptions(option))
   )
 
-  const getZeroConfLimit = it => {
-    if (currentCurrency === 'Ethereum')
-      return <div style={classes.editDisabled}>{it}</div>
-    return it
-  }
-
   return [
     {
       name: 'id',
@@ -127,7 +119,8 @@ const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => {
       name: 'zeroConfLimit',
       size: 'sm',
       stripe: true,
-      view: getZeroConfLimit,
+      view: (it, row) =>
+        row.id === 'ETH' ? <span style={classes.editDisabled}>{it}</span> : it,
       input: NumberInput,
       width: 190 - widthAdjust,
       inputProps: {