diff --git a/packages/provider-sherpa/src/sherpa.ts b/packages/provider-sherpa/src/sherpa.ts
index 540701944..aed14371c 100644
--- a/packages/provider-sherpa/src/sherpa.ts
+++ b/packages/provider-sherpa/src/sherpa.ts
@@ -560,13 +560,24 @@ class SherpaProvider extends ProviderClass<WASocket> {
                     // Buscar siempre el que tenga formato @s.whatsapp.net (puede estar en remoteJid o remoteJidAlt)
                     const remoteJid = (messageCtx?.key as any)?.remoteJid
                     const remoteJidAlt = (messageCtx?.key as any)?.remoteJidAlt
+                    const senderPhoneNumber = messageCtx?.key?.senderPn
+                    const senderLid = messageCtx?.key?.senderLid
                     const fromParse = remoteJid?.includes('@lid') ? remoteJidAlt : remoteJid
+                    const from = senderPhoneNumber ? senderPhoneNumber : senderLid ? senderLid : fromParse
+
+                    console.log('from', from)
+                    console.log('senderPhoneNumber', senderPhoneNumber)
+                    console.log('senderLid', senderLid)
+                    console.log('fromParse', fromParse)
+                    console.log('remoteJid', remoteJid)
+                    console.log('remoteJidAlt', remoteJidAlt)
+                    console.log('messageCtx', messageCtx)
 
                     let payload = {
                         ...messageCtx,
                         body: textToBody,
                         name: messageCtx?.pushName,
-                        from: baileyCleanNumber(fromParse),
+                        from: baileyCleanNumber(from),
                     }
 
                     if (messageCtx.message?.locationMessage) {
diff --git a/packages/provider-sherpa/src/utils.ts b/packages/provider-sherpa/src/utils.ts
index 4b9eee7f6..ae1294ded 100644
--- a/packages/provider-sherpa/src/utils.ts
+++ b/packages/provider-sherpa/src/utils.ts
@@ -18,6 +18,9 @@ const emptyDirSessions = async (pathBase: string) =>
  * @returns The cleaned number.
  */
 const baileyCleanNumber = (number: string, full: boolean = false): string => {
+    if (!number || typeof number !== 'string') {
+        return ''
+    }
     const regexGroup: RegExp = /\@g.us\b/gm
     const exist = number.match(regexGroup)
     if (exist) return number