diff --git a/lib/blacklist.js b/lib/blacklist.js
index 63a7fb13..2a34a1f2 100644
--- a/lib/blacklist.js
+++ b/lib/blacklist.js
@@ -3,13 +3,12 @@ const _ = require('lodash/fp')
 const db = require('./db')
 const notifierQueries = require('./notifier/queries')
 
-const getBlacklist = () => {
-  const blacklistSql = `SELECT * FROM blacklist`
-  const messagesSql = `SELECT * FROM blacklist_messages`
-  return Promise.all([db.any(blacklistSql), db.any(messagesSql)])
-    .then(([blacklist, messages]) => Promise.all([_.map(_.mapKeys(_.camelCase), blacklist), _.map(_.mapKeys(_.camelCase), messages)]))
-    .then(([blacklist, messages]) => _.map(it => ({ ...it, blacklistMessage: _.find(ite => it.blacklistMessageId === ite.id, messages) }), blacklist))
-}
+const getBlacklist = () =>
+  db.any(
+    `SELECT blacklist.address AS address, blacklist_messages.content AS blacklistMessage
+     FROM blacklist JOIN blacklist_messages
+     ON blacklist.blacklist_message_id = blacklist_messages.id`
+  )
 
 const deleteFromBlacklist = address => {
   const sql = `DELETE FROM blacklist WHERE address = $1`