diff --git a/m2d/converters/event-to-message.js b/m2d/converters/event-to-message.js
index 3b1a7d2..6d0232c 100644
--- a/m2d/converters/event-to-message.js
+++ b/m2d/converters/event-to-message.js
@@ -108,9 +108,9 @@ turndownService.addRule("inlineLink", {
 		if (node.getAttribute("data-channel-id")) return `<#${node.getAttribute("data-channel-id")}>`
 		const href = node.getAttribute("href")
 		let brackets = ["", ""]
-		if (href.startsWith("https://matrix.to")) brackets = ["<", ">"]
-		if (href.startsWith("https://matrix.to/#/@")) content = "@" + content
 		content = content.replace(/ @.*/, "")
+		if (href.startsWith("https://matrix.to")) brackets = ["<", ">"]
+		if (href.startsWith("https://matrix.to/#/@") && content[0] !== "@") content = "@" + content
 		return "[" + content + "](" + brackets[0] + href + brackets[1] + ")"
 	}
 })