diff --git a/src/Store/in-memory-store.ts b/src/Store/in-memory-store.ts
index b6ca041..cda9c6e 100644
--- a/src/Store/in-memory-store.ts
+++ b/src/Store/in-memory-store.ts
@@ -115,7 +115,7 @@ export default(
 						const list = assertMessageList(jid)
 						const [lastItem] = list.array.slice(-1)
 						// reset message list
-						if(lastItem && lastItem.key.id !== msg.key.id) {
+						if(lastItem?.key.id !== msg.key.id) {
 							list.clear()
 							list.upsert(msg, 'append')
 						}
diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts
index 0a7c39f..9025e90 100644
--- a/src/Utils/messages.ts
+++ b/src/Utils/messages.ts
@@ -267,10 +267,10 @@ export const generateWAMessageContent = async(
 			options
 		)
 	}
-	if('mentions' in message) {
-		const [messageType] = Object.keys(message)
-		message[messageType].contextInfo = message[messageType] || { }
-		message[messageType].contextInfo.mentionedJid = message.mentions
+	if('mentions' in message && message.mentions?.length) {
+		const [messageType] = Object.keys(m)
+		m[messageType].contextInfo = m[messageType] || { }
+		m[messageType].contextInfo.mentionedJid = message.mentions
 	}
 	return WAMessageProto.Message.fromObject(m)
 }