diff --git a/src/m2d/actions/emoji-sheet.js b/src/m2d/actions/emoji-sheet.js
index a63f0b0..ed5ab88 100644
--- a/src/m2d/actions/emoji-sheet.js
+++ b/src/m2d/actions/emoji-sheet.js
@@ -7,6 +7,8 @@ const {sync} = require("../../passthrough")
 const emojiSheetConverter = sync.require("../converters/emoji-sheet")
 /** @type {import("../../matrix/api")} */
 const api = sync.require("../../matrix/api")
+/** @type {import("../../matrix/mreq")} */
+const mreq = sync.require("../../matrix/mreq")
 
 /**
  * Downloads the emoji from the web and converts to uncompressed PNG data.
@@ -19,6 +21,10 @@ async function getAndConvertEmoji(mxc) {
 	// If we were using connection pooling, we would be forced to download the entire GIF.
 	// So we set no agent to ensure we are not connection pooling.
 	const res = await api.getMedia(mxc, {signal: abortController.signal})
+	if (res.status !== 200) {
+		const root = await res.json()
+		throw new mreq.MatrixServerError(root, {mxc})
+	}
 	const readable = stream.Readable.fromWeb(res.body)
 	return emojiSheetConverter.convertImageStream(readable, () => {
 		abortController.abort()
diff --git a/src/m2d/converters/event-to-message.js b/src/m2d/converters/event-to-message.js
index 3cf08cf..61525e2 100644
--- a/src/m2d/converters/event-to-message.js
+++ b/src/m2d/converters/event-to-message.js
@@ -11,6 +11,7 @@ const entities = require("entities")
 
 const passthrough = require("../../passthrough")
 const {sync, db, discord, select, from} = passthrough
+const {reg} = require("../../matrix/read-registration")
 /** @type {import("../converters/utils")} */
 const mxUtils = sync.require("../converters/utils")
 /** @type {import("../../discord/utils")} */
@@ -238,7 +239,8 @@ function convertEmoji(mxcUrl, nameForGuess, allowSpriteSheetIndicator, allowLink
 		if (!found) row = null
 	}
 	// Or, if we don't have an emoji right now, we search for the name instead.
-	if (!row && nameForGuess) {
+	const isLocalMxc = mxcUrl?.match(/^mxc:\/\/([^/]+)/)?.[1] === reg.ooye.server_name
+	if (!row && nameForGuess && isLocalMxc) {
 		const nameForGuessLower = nameForGuess.toLowerCase()
 		for (const guild of discord.guilds.values()) {
 			/** @type {{name: string, id: string, animated: number}[]} */