diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts
index 79b5b5d..ee880e5 100644
--- a/src/Utils/messages.ts
+++ b/src/Utils/messages.ts
@@ -543,7 +543,7 @@ export const generateWAMessageFromContent = (
 
 		// if a participant is quoted, then it must be a group
 		// hence, remoteJid of group must also be entered
-		if(quoted.key.participant || quoted.participant) {
+		if(jid !== quoted.key.remoteJid) {
 			contextInfo.remoteJid = quoted.key.remoteJid
 		}
 
@@ -563,11 +563,6 @@ export const generateWAMessageFromContent = (
 			expiration: options.ephemeralExpiration || WA_DEFAULT_EPHEMERAL,
 			//ephemeralSettingTimestamp: options.ephemeralOptions.eph_setting_ts?.toString()
 		}
-		message = {
-			ephemeralMessage: {
-				message
-			}
-		}
 	}
 
 	message = WAProto.Message.fromObject(message)