diff --git a/lib/database.js b/lib/database.js
index 3c23290..91db293 100644
--- a/lib/database.js
+++ b/lib/database.js
@@ -88,6 +88,7 @@ fns.findLatestMessagesByDistinctConversation = (userId, query) => {
             });
         })
         .then(promises => Promise.all(promises))
+        .then(messages => messages.filter(message => message.length))
         .then(results => {
             let merged = [].concat.apply([], results);
             merged.sort((a, b) => {