diff --git a/d2m/actions/send-message.js b/d2m/actions/send-message.js
index a0027b0..082cce4 100644
--- a/d2m/actions/send-message.js
+++ b/d2m/actions/send-message.js
@@ -40,7 +40,7 @@ async function sendMessage(message, guild) {
 	}
 	for (const event of events) {
 		const eventType = event.$type
-		if (event.$sender) senderMxid = event.$sender
+		if ("$sender" in event) senderMxid = event.$sender
 		/** @type {Pick<typeof event, Exclude<keyof event, "$type" | "$sender">> & { $type?: string, $sender?: string }} */
 		const eventWithoutType = {...event}
 		delete eventWithoutType.$type
diff --git a/d2m/converters/message-to-event.js b/d2m/converters/message-to-event.js
index c0c937e..1a063a5 100644
--- a/d2m/converters/message-to-event.js
+++ b/d2m/converters/message-to-event.js
@@ -108,7 +108,8 @@ async function messageToEvent(message, guild, options = {}, di) {
 		const event = await di.api.getEvent(roomID, eventID)
 		return [{
 			...event.content,
-			$type: event.type
+			$type: event.type,
+			$sender: null
 		}]
 	}
 
diff --git a/d2m/converters/message-to-event.test.js b/d2m/converters/message-to-event.test.js
index 8e2ba53..8f89a43 100644
--- a/d2m/converters/message-to-event.test.js
+++ b/d2m/converters/message-to-event.test.js
@@ -485,6 +485,7 @@ test("message2event: thread start message reference", async t => {
 	})
 	t.deepEqual(events, [{
 		$type: "m.room.message",
+		$sender: null,
 		msgtype: "m.text",
 		body: "layer 4",
 		"m.mentions": {}
diff --git a/m2d/converters/emoji.js b/m2d/converters/emoji.js
index 214022f..2c39a86 100644
--- a/m2d/converters/emoji.js
+++ b/m2d/converters/emoji.js
@@ -36,6 +36,7 @@ function encodeEmoji(input, shortcode) {
 
 		const forceTrimmedList = [
 			"%F0%9F%91%8D", // 👍
+			"%F0%9F%91%8E", // 👎️
 			"%E2%AD%90", // ⭐
 			"%F0%9F%90%88", // 🐈
 			"%E2%9D%93", // ❓