diff --git a/src/WAClient/Messages.ts b/src/WAClient/Messages.ts
index 8643724..54e07df 100644
--- a/src/WAClient/Messages.ts
+++ b/src/WAClient/Messages.ts
@@ -88,11 +88,15 @@ export default class WhatsAppWebMessages extends WhatsAppWebGroups {
         return response as {status: number, stamp: string}
     }
     async loadMessage (jid: string, messageID: string) {
-        const messages = await this.loadConversation (jid, 1, {id: messageID, fromMe: false}, false)
-        var index = null
-        if (messages.length > 0) {
-            index = {id: messages[0].key.id, fromMe: false}
+        let messages
+        try {
+            messages = await this.loadConversation (jid, 1, {id: messageID, fromMe: true}, false)
+        } catch {
+            messages = await this.loadConversation (jid, 1, {id: messageID, fromMe: false}, false)
         }
+        var index = null
+        if (messages.length > 0) index = messages[0].key
+        
         const actual = await this.loadConversation (jid, 1, index)
         return actual[0]
     }
diff --git a/src/WAClient/Tests.ts b/src/WAClient/Tests.ts
index 9648499..5635004 100644
--- a/src/WAClient/Tests.ts
+++ b/src/WAClient/Tests.ts
@@ -69,16 +69,6 @@ WAClientTest('Messages', (client) => {
         await createTimeout (2000)
         await client.clearMessage (messages[0].key)
     })
-    it ('should load convo', async () => {
-        /*const [chats] = await client.receiveChatsAndContacts ()
-        for (var i in chats) {
-            if (chats[i].jid.includes('@g.us')) {
-                console.log (chats[i].jid)
-                const data = await client.groupCreatorAndParticipants (chats[i].jid)
-            }
-        }*/
-        
-    })
 })
 
 describe('Validate WhatsApp IDs', () => {