diff --git a/d2m/converters/message-to-event.test.js b/d2m/converters/message-to-event.test.js
index fbfe06df..02fb4bb2 100644
--- a/d2m/converters/message-to-event.test.js
+++ b/d2m/converters/message-to-event.test.js
@@ -64,6 +64,44 @@ test("message2event: simple user mention", async t => {
 test("message2event: simple room mention", async t => {
 	let called = 0
 	const events = await messageToEvent(data.message.simple_room_mention, data.guild.general, {}, {
+		api: {
+			async getStateEvent(roomID, type, key) {
+				called++
+				t.equal(roomID, "!BnKuBPCvyfOkhcUjEu:cadence.moe")
+				t.equal(type, "m.room.power_levels")
+				t.equal(key, "")
+				return {
+					users: {
+						"@_ooye_bot:cadence.moe": 100
+					}
+				}
+			},
+			async getJoinedMembers(roomID) {
+				called++
+				t.equal(roomID, "!BnKuBPCvyfOkhcUjEu:cadence.moe")
+				return {
+					joined: {
+						"@_ooye_bot:cadence.moe": {display_name: null, avatar_url: null},
+						"@user:matrix.org": {display_name: null, avatar_url: null}
+					}
+				}
+			}
+		}
+	})
+	t.deepEqual(events, [{
+		$type: "m.room.message",
+		"m.mentions": {},
+		msgtype: "m.text",
+		body: "#worm-farm",
+		format: "org.matrix.custom.html",
+		formatted_body: '<a href="https://matrix.to/#/!BnKuBPCvyfOkhcUjEu:cadence.moe?via=cadence.moe&via=matrix.org">#worm-farm</a>'
+	}])
+	t.equal(called, 2, "should call getStateEvent and getJoinedMembers once each")
+})
+
+test("message2event: nicked room mention", async t => {
+	let called = 0
+	const events = await messageToEvent(data.message.nicked_room_mention, data.guild.general, {}, {
 		api: {
 			async getStateEvent(roomID, type, key) {
 				called++
diff --git a/m2d/converters/event-to-message.js b/m2d/converters/event-to-message.js
index 6b762b41..52347554 100644
--- a/m2d/converters/event-to-message.js
+++ b/m2d/converters/event-to-message.js
@@ -685,7 +685,7 @@ async function eventToMessage(event, guild, di) {
 					let preNode
 					if (node.nodeType === 3 && node.nodeValue.includes("```") && (preNode = nodeIsChildOf(node, ["PRE"]))) {
 						if (preNode.firstChild?.nodeName === "CODE") {
-							const ext = (preNode.firstChild.className.match(/language-(\S+)/) || [null, "txt"])[1]
+							const ext = preNode.firstChild.className.match(/language-(\S+)/)?.[1] || "txt"
 							const filename = `inline_code.${ext}`
 							// Build the replacement <code> node
 							const replacementCode = doc.createElement("code")
diff --git a/m2d/converters/event-to-message.test.js b/m2d/converters/event-to-message.test.js
index a802d288..d6a20cd0 100644
--- a/m2d/converters/event-to-message.test.js
+++ b/m2d/converters/event-to-message.test.js
@@ -772,6 +772,38 @@ test("event2message: code blocks are uploaded as attachments instead if they con
 	)
 })
 
+test("event2message: code blocks are uploaded as attachments instead if they contain incompatible backticks (default to txt file extension)", async t => {
+	t.deepEqual(
+		await eventToMessage({
+			type: "m.room.message",
+			sender: "@cadence:cadence.moe",
+			content: {
+				msgtype: "m.text",
+				body: "wrong body",
+				format: "org.matrix.custom.html",
+				formatted_body: 'So if you run code like this<pre><code>System.out.println("```");</code></pre>it should print a markdown formatted code block'
+			},
+			event_id: "$pGkWQuGVmrPNByrFELxhzI6MCBgJecr5I2J3z88Gc2s",
+			room_id: "!BpMdOUkWWhFxmTrENV:cadence.moe"
+		}),
+		{
+			ensureJoined: [],
+			messagesToDelete: [],
+			messagesToEdit: [],
+			messagesToSend: [{
+				username: "cadence [they]",
+				content: "So if you run code like this `[inline_code.txt]` it should print a markdown formatted code block",
+				attachments: [{id: "0", filename: "inline_code.txt"}],
+				pendingFiles: [{name: "inline_code.txt", buffer: Buffer.from('System.out.println("```");')}],
+				avatar_url: undefined,
+				allowed_mentions: {
+					parse: ["users", "roles"]
+				}
+			}]
+		}
+	)
+})
+
 test("event2message: characters are encoded properly in code blocks", async t => {
 	t.deepEqual(
 		await eventToMessage({
diff --git a/test/data.js b/test/data.js
index 058a9929..18aaa1af 100644
--- a/test/data.js
+++ b/test/data.js
@@ -450,6 +450,63 @@ module.exports = {
 			components: []
 		},
 		simple_room_mention: {
+			type: 0,
+			tts: false,
+			timestamp: "2023-07-10T20:04:25.939000+00:00",
+			referenced_message: null,
+			pinned: false,
+			nonce: "1128054139385806848",
+			mentions: [],
+			mention_roles: [],
+			mention_everyone: false,
+			member: {
+				roles: [
+					"112767366235959296",  "118924814567211009",
+					"204427286542417920",  "199995902742626304",
+					"222168467627835392",  "238028326281805825",
+					"259806643414499328",  "265239342648131584",
+					"271173313575780353",  "287733611912757249",
+					"225744901915148298",  "305775031223320577",
+					"318243902521868288",  "348651574924541953",
+					"349185088157777920",  "378402925128712193",
+					"392141548932038658",  "393912152173576203",
+					"482860581670486028",  "495384759074160642",
+					"638988388740890635",  "373336013109461013",
+					"530220455085473813",  "454567553738473472",
+					"790724320824655873",  "1123518980456452097",
+					"1040735082610167858", "695946570482450442",
+					"1123460940935991296", "849737964090556488"
+				],
+				premium_since: null,
+				pending: false,
+				nick: null,
+				mute: false,
+				joined_at: "2015-11-11T09:55:40.321000+00:00",
+				flags: 0,
+				deaf: false,
+				communication_disabled_until: null,
+				avatar: null
+			},
+			id: "1128054143064494233",
+			flags: 0,
+			embeds: [],
+			edited_timestamp: null,
+			content: "<#1100319550446252084>",
+			components: [],
+			channel_id: "266767590641238027",
+			author: {
+				username: "kumaccino",
+				public_flags: 128,
+				id: "113340068197859328",
+				global_name: "kumaccino",
+				discriminator: "0",
+				avatar_decoration: null,
+				avatar: "b48302623a12bc7c59a71328f72ccb39"
+			},
+			attachments: [],
+			guild_id: "112760669178241024"
+		},
+		nicked_room_mention: {
 			type: 0,
 			tts: false,
 			timestamp: "2023-07-10T20:04:25.939000+00:00",