diff --git a/app/services/whatsapp/baileys_handlers/helpers.rb b/app/services/whatsapp/baileys_handlers/helpers.rb
index f401b6739..0c6a1d70f 100644
--- a/app/services/whatsapp/baileys_handlers/helpers.rb
+++ b/app/services/whatsapp/baileys_handlers/helpers.rb
@@ -8,7 +8,9 @@ module Whatsapp::BaileysHandlers::Helpers # rubocop:disable Metrics/ModuleLength
   end
 
   def sender_lid
-    @raw_message[:key][:senderLid]
+    return @raw_message[:key][:senderLid] if @raw_message[:key].key?(:senderLid)
+
+    @raw_message[:key][:remoteJid] if jid_type == 'lid'
   end
 
   def incoming?