diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index cf4098f..0bb090c 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -425,13 +425,17 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
             })
         }
 
-        ev.emit(
-            'messages.upsert', 
-            { 
-                messages: fullMessages.map(m => proto.WebMessageInfo.fromObject(m)), 
-                type: stanza.attrs.offline ? 'append' : 'notify' 
-            }
-        )
+        if(fullMessages.length) {
+            ev.emit(
+                'messages.upsert', 
+                { 
+                    messages: fullMessages.map(m => proto.WebMessageInfo.fromObject(m)), 
+                    type: stanza.attrs.offline ? 'append' : 'notify' 
+                }
+            )
+        } else {
+            logger.warn({ stanza }, `received node with 0 messages`)
+        }
     })
 
     ws.on('CB:ack,class:message', async(node: BinaryNode) => {