diff --git a/src/d2m/discord-client.js b/src/d2m/discord-client.js
index 7b0fcf8..c2a0549 100644
--- a/src/d2m/discord-client.js
+++ b/src/d2m/discord-client.js
@@ -52,7 +52,11 @@ class DiscordClient {
 		/** @type {Map<string, Array<string>>} */
 		this.guildChannelMap = new Map()
 		if (listen !== "no") {
-			this.cloud.on("event", message => discordPackets.onPacket(this, message, listen))
+			this.cloud.on("event", message => {
+				process.nextTick(() => {
+					discordPackets.onPacket(this, message, listen)
+				})
+			})
 		}
 
 		const addEventLogger = (eventName, logName) => {
diff --git a/src/matrix/file.js b/src/matrix/file.js
index 7bc1fec..c469aea 100644
--- a/src/matrix/file.js
+++ b/src/matrix/file.js
@@ -85,6 +85,7 @@ async function _actuallyUploadDiscordFileToMxc(url) {
 			writeRegistration(reg)
 			return root
 		}
+		e.uploadURL = url
 		throw e
 	}
 }