diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index 8dd4e651..4b9073c1 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -412,7 +412,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 
 		const { attrs, content } = node
 		const isNodeFromMe = areJidsSameUser(attrs.participant || attrs.from, authState.creds.me?.id)
-		const remoteJid = !isNodeFromMe ? attrs.from : attrs.recipient
+		const remoteJid = !isNodeFromMe || isJidGroup(attrs.from) ? attrs.from : attrs.recipient
 		const fromMe = !attrs.recipient
 
 		const ids = [attrs.id]