diff --git a/js/modules/data.js b/js/modules/data.js
index 10bc93156e..357ad04e2b 100644
--- a/js/modules/data.js
+++ b/js/modules/data.js
@@ -254,6 +254,10 @@ async function _removeMessages(ids) {
 
 async function getMessageById(id, { Message }) {
   const message = await channels.getMessageById(id);
+  if (!message) {
+    return null;
+  }
+
   return new Message(message);
 }
 
@@ -352,6 +356,10 @@ async function getAllUnprocessed() {
 
 async function getUnprocessedById(id, { Unprocessed }) {
   const unprocessed = await channels.getUnprocessedById(id);
+  if (!unprocessed) {
+    return null;
+  }
+
   return new Unprocessed(unprocessed);
 }