diff --git a/package.json b/package.json
index e00f1e39..17a90ebc 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "@figuro/chatwoot-sdk": "^1.1.16",
     "@hapi/boom": "^10.0.1",
     "@sentry/node": "^7.59.2",
-    "@whiskeysockets/baileys": "^6.5.0",
+    "@whiskeysockets/baileys": "github:WhiskeySockets/Baileys#fix-lids",
     "amqplib": "^0.10.3",
     "axios": "^1.3.5",
     "class-validator": "^0.13.2",
diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts
index 7493adc3..40ce46a4 100644
--- a/src/whatsapp/services/whatsapp.service.ts
+++ b/src/whatsapp/services/whatsapp.service.ts
@@ -1512,11 +1512,11 @@ export class WAStartupService {
       const received = messages[0];
 
       if (
-        type !== 'notify'
-        // !received?.message ||
-        // received.message?.protocolMessage ||
-        // received.message.senderKeyDistributionMessage ||
-        // received.message?.pollUpdateMessage
+        type !== 'notify' ||
+        !received?.message ||
+        received.message?.protocolMessage ||
+        received.message.senderKeyDistributionMessage ||
+        received.message?.pollUpdateMessage
       ) {
         this.logger.verbose('message rejected');
         return;
@@ -1934,8 +1934,8 @@ export class WAStartupService {
   private createJid(number: string): string {
     this.logger.verbose('Creating jid with number: ' + number);
 
-    if (number.includes('@g.us') || number.includes('@s.whatsapp.net')) {
-      this.logger.verbose('Number already contains @g.us or @s.whatsapp.net');
+    if (number.includes('@g.us') || number.includes('@s.whatsapp.net') || number.includes('@lid')) {
+      this.logger.verbose('Number already contains @g.us or @s.whatsapp.net or @lid');
       return number;
     }