diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 278ec3865..559b20c60 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -380,7 +380,7 @@ async function isMessageDuplicate({
     if (!result) {
       return false;
     }
-    const filteredResult = result.filter(
+    const filteredResult = [result].filter(
       (m: any) => m.attributes.body === message.body
     );
     const isSimilar = filteredResult.some((m: any) =>
diff --git a/ts/session/messages/MessageController.ts b/ts/session/messages/MessageController.ts
index 18a21d109..d1a7bab1c 100644
--- a/ts/session/messages/MessageController.ts
+++ b/ts/session/messages/MessageController.ts
@@ -53,7 +53,7 @@ export class MessageController {
     window.log.warn('Cleaning up getMessageController() oldest messages...');
     const now = Date.now();
 
-    this.messageLookup.forEach(messageEntry => {
+    (this.messageLookup || []).forEach(messageEntry => {
       const { message, timestamp } = messageEntry;
       const conversation = message.getConversation();