diff --git a/lib/blacklist.js b/lib/blacklist.js
index 79835f10..63a7fb13 100644
--- a/lib/blacklist.js
+++ b/lib/blacklist.js
@@ -27,15 +27,8 @@ const insertIntoBlacklist = address => {
 
 function blocked (address) {
   const sql = `SELECT address, content FROM blacklist b LEFT OUTER JOIN blacklist_messages bm ON bm.id = b.blacklist_message_id WHERE address = $1`
-  return db.any(sql, [address])
-}
-
-function addToUsedAddresses (address) {
-  // ETH reuses addresses
-  // if (cryptoCode === 'ETH') return Promise.resolve()
-
-  const sql = `INSERT INTO blacklist (address) VALUES ($1)`
   return db.oneOrNone(sql, [address])
+    .then(r => !_.isNil(r))
 }
 
 function getMessages () {
@@ -50,7 +43,6 @@ function editBlacklistMessage (id, content) {
 
 module.exports = {
   blocked,
-  addToUsedAddresses,
   getBlacklist,
   deleteFromBlacklist,
   insertIntoBlacklist,
diff --git a/lib/cash-in/cash-in-tx.js b/lib/cash-in/cash-in-tx.js
index 2f301cc5..f321e8fe 100644
--- a/lib/cash-in/cash-in-tx.js
+++ b/lib/cash-in/cash-in-tx.js
@@ -40,28 +40,31 @@ function post (machineTx, pi) {
 
       const isFirstPost = !r.tx.fiat || r.tx.fiat.isZero()
       if (isFirstPost) {
-        promises.push(checkForBlacklisted(updatedTx), doesTxReuseAddress(updatedTx), getWalletScore(updatedTx, pi))
+        promises.push(
+          checkForBlacklisted(updatedTx),
+          doesTxReuseAddress(updatedTx),
+          getWalletScore(updatedTx, pi)
+        )
       }
 
       return Promise.all(promises)
-        .then(([config, blacklistItems = false, isReusedAddress = false, fetchedWalletScore = null]) => {
+        .then(([config, isBlacklisted = false, isReusedAddress = false, fetchedWalletScore = null]) => {
           const rejectAddressReuse = configManager.getCompliance(config).rejectAddressReuse
 
           walletScore = fetchedWalletScore
 
-          if (_.some(it => it.address === updatedTx.toAddress)(blacklistItems)) {
-            blacklisted = _.find(it => it.address === updatedTx.toAddress)(blacklistItems)
+          if (isBlacklisted) {
             notifier.notifyIfActive('compliance', 'blacklistNotify', r.tx, false)
           } else if (isReusedAddress && rejectAddressReuse) {
             notifier.notifyIfActive('compliance', 'blacklistNotify', r.tx, true)
             addressReuse = true
           }
-          return postProcess(r, pi, blacklisted, addressReuse, walletScore)
+          return postProcess(r, pi, isBlacklisted, addressReuse, walletScore)
         })
         .then(changes => _.set('walletScore', _.isNil(walletScore) ? null : walletScore.score, changes))
         .then(changes => cashInLow.update(db, updatedTx, changes))
         .then(tx => _.set('bills', machineTx.bills, tx))
-        .then(tx => _.set('blacklisted', Boolean(blacklisted), tx))
+        .then(tx => _.set('blacklisted', isBlacklisted, tx))
         .then(tx => _.set('blacklistMessage', blacklisted?.content, tx))
         .then(tx => _.set('addressReuse', addressReuse, tx))
         .then(tx => _.set('validWalletScore', _.isNil(walletScore) ? true : walletScore.isValid, tx))
diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.js b/new-lamassu-admin/src/pages/Blacklist/Blacklist.js
index 59c97e64..0ca8c509 100644
--- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.js
+++ b/new-lamassu-admin/src/pages/Blacklist/Blacklist.js
@@ -35,11 +35,6 @@ const GET_BLACKLIST = gql`
   query getBlacklistData {
     blacklist {
       address
-      blacklistMessage {
-        id
-        label
-        content
-      }
     }
     cryptoCurrencies {
       display
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js
index 4c764b46..f3790959 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js
+++ b/new-lamassu-admin/src/pages/Blacklist/BlacklistAdvanced.js
@@ -22,8 +22,8 @@ const useStyles = makeStyles(styles)
 const DEFAULT_MESSAGE = `This address may be associated with a deceptive offer or a prohibited group. Please make sure you're using an address from your own wallet.`
 
 const getErrorMsg = (formikErrors, formikTouched, mutationError) => {
-  if (!formikErrors || !formikTouched) return null
   if (mutationError) return 'Internal server error'
+  if (!formikErrors || !formikTouched) return null
   if (formikErrors.event && formikTouched.event) return formikErrors.event
   if (formikErrors.message && formikTouched.message) return formikErrors.message
   return null
@@ -79,7 +79,8 @@ const BlacklistAdvanced = ({
         <IconButton
           className={classes.deleteButton}
           disabled={
-            !R.isNil(R.path(['allowToggle']) && !R.path(['allowToggle'], it))
+            !R.isNil(R.path(['allowToggle'], it)) &&
+            !R.path(['allowToggle'], it)
           }>
           {R.path(['allowToggle'], it) ? (
             <DeleteIcon />