diff --git a/packages/core/src/highlevel/types/messages/dialog.ts b/packages/core/src/highlevel/types/messages/dialog.ts
index 1867cc55..7ba7c020 100644
--- a/packages/core/src/highlevel/types/messages/dialog.ts
+++ b/packages/core/src/highlevel/types/messages/dialog.ts
@@ -206,7 +206,10 @@ export class Dialog {
         const cid = this.peer.id
 
         if (this._messages.has(cid)) {
-            return new Message(this._messages.get(cid)!, this._peers)
+            const msg = this._messages.get(cid)!
+            if (msg._ === 'messageEmpty') return null
+
+            return new Message(msg, this._peers)
         }
 
         return null