diff --git a/__test__/00-case.test.js b/__test__/0.0.0-case.test.js
similarity index 100%
rename from __test__/00-case.test.js
rename to __test__/0.0.0-case.test.js
diff --git a/__test__/02-case.test.js b/__test__/0.1.2-case.test.js
similarity index 100%
rename from __test__/02-case.test.js
rename to __test__/0.1.2-case.test.js
diff --git a/__test__/03-case.test.js b/__test__/0.1.3-case.test.js
similarity index 100%
rename from __test__/03-case.test.js
rename to __test__/0.1.3-case.test.js
diff --git a/__test__/04-case.test.js b/__test__/0.1.4-case.test.js
similarity index 100%
rename from __test__/04-case.test.js
rename to __test__/0.1.4-case.test.js
diff --git a/__test__/05-case.test.js b/__test__/0.1.5-case.test.js
similarity index 100%
rename from __test__/05-case.test.js
rename to __test__/0.1.5-case.test.js
diff --git a/__test__/06-case.test.js b/__test__/0.1.6-case.test.js
similarity index 100%
rename from __test__/06-case.test.js
rename to __test__/0.1.6-case.test.js
diff --git a/packages/provider/src/baileys/index.js b/packages/provider/src/baileys/index.js
index dd0e671..a2d88ae 100644
--- a/packages/provider/src/baileys/index.js
+++ b/packages/provider/src/baileys/index.js
@@ -118,9 +118,17 @@ class BaileysProvider extends ProviderClass {
                 let payload = {
                     ...messageCtx,
                     body: messageCtx?.message?.extendedTextMessage?.text ?? messageCtx?.message?.conversation,
+
                     from: messageCtx?.key?.remoteJid,
                 }
 
+                if (messageCtx.message.locationMessage) {
+                    const { degreesLatitude, degreesLongitude } = messageCtx.message.locationMessage
+                    if (typeof degreesLatitude === 'number' && typeof degreesLongitude === 'number') {
+                        payload = { ...payload, body: `📍` }
+                    }
+                }
+
                 if (payload.from === 'status@broadcast') return
 
                 if (payload?.key?.fromMe) return
diff --git a/packages/provider/src/venom/index.js b/packages/provider/src/venom/index.js
index 1369af2..6776033 100644
--- a/packages/provider/src/venom/index.js
+++ b/packages/provider/src/venom/index.js
@@ -85,11 +85,17 @@ class VenomProvider extends ProviderClass {
                 if (payload.from === 'status@broadcast') {
                     return
                 }
-
                 if (!venomisValidNumber(payload.from)) {
                     return
                 }
                 payload.from = venomCleanNumber(payload.from, true)
+                if (payload.hasOwnProperty('lat') && payload.hasOwnProperty('lng')) {
+                    const lat = payload.lat
+                    const lng = payload.lng
+                    if (lat !== '' && lng !== '') {
+                        payload = { ...payload, body: `📍` }
+                    }
+                }
                 this.emit('message', payload)
             },
         },
diff --git a/packages/provider/src/web-whatsapp/index.js b/packages/provider/src/web-whatsapp/index.js
index 4d566ee..2e87938 100644
--- a/packages/provider/src/web-whatsapp/index.js
+++ b/packages/provider/src/web-whatsapp/index.js
@@ -90,6 +90,9 @@ class WebWhatsappProvider extends ProviderClass {
                     return
                 }
                 payload.from = wwebCleanNumber(payload.from, true)
+                if (payload._data.lat && payload._data.lng) {
+                    payload = { ...payload, body: `📍` }
+                }
                 this.emit('message', payload)
             },
         },