diff --git a/src/bot.ts b/src/bot.ts
index 3879c8b8a69b68fb8c994120b4d33d5c2f888435..c6053d6cb45c86bfce83859ab31ef50801d5836f 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -813,7 +813,7 @@ export class DiscordBot {
             await Util.AsyncForEach(msg.attachments.array(), async (attachment) => {
                 const content = await Util.DownloadFile(attachment.url);
                 const fileMime = content.mimeType || mime.getType(attachment.filename) || "application/octet-stream";
-                const mxcUrl = await this.bridge.botIntent.underlyingClient.uploadContent(
+                const mxcUrl = await intent.underlyingClient.uploadContent(
                     content.buffer,
                     fileMime,
                     attachment.filename,
diff --git a/src/usersyncroniser.ts b/src/usersyncroniser.ts
index 9e046e4f833f3a795df7c11d7ffc60004e116984..5633574cedd88e703a3bcca6ce3905d72134fff7 100644
--- a/src/usersyncroniser.ts
+++ b/src/usersyncroniser.ts
@@ -134,7 +134,7 @@ export class UserSyncroniser {
         if (userState.avatarUrl !== null) {
             log.verbose(`Updating avatar_url for ${userState.mxUserId} to "${userState.avatarUrl}"`);
             const data = await Util.DownloadFile(userState.avatarUrl);
-            const avatarMxc = await this.bridge.botIntent.underlyingClient.uploadContent(
+            const avatarMxc = await intent.underlyingClient.uploadContent(
                 data.buffer,
                 data.mimeType,
                 userState.avatarId,
diff --git a/test/test_discordbot.ts b/test/test_discordbot.ts
index 5b93888784bd199a5c8bb62235827949af710362..dd4a1a1250be7134911ecc3ba260efa7c10d41f6 100644
--- a/test/test_discordbot.ts
+++ b/test/test_discordbot.ts
@@ -171,8 +171,9 @@ describe("DiscordBot", () => {
                 width: 0,
             });
             await discordBot.OnMessage(msg);
-            mockBridge.botIntent.underlyingClient.wasCalled("uploadContent");
-            mockBridge.getIntent(author.id).wasCalled("sendEvent", true, "!asdf:localhost", {
+            const intent = mockBridge.getIntent(author.id);
+            intent.underlyingClient.wasCalled("uploadContent");
+            intent.wasCalled("sendEvent", true, "!asdf:localhost", {
                 body: "someimage.png",
                 external_url: "asdf",
                 info: {
@@ -196,8 +197,9 @@ describe("DiscordBot", () => {
                 width: 0,
             });
             await discordBot.OnMessage(msg);
-            mockBridge.botIntent.underlyingClient.wasCalled("uploadContent");
-            mockBridge.getIntent(author.id).wasCalled("sendEvent", true, "!asdf:localhost", {
+            const intent = mockBridge.getIntent(author.id);
+            intent.underlyingClient.wasCalled("uploadContent");
+            intent.wasCalled("sendEvent", true, "!asdf:localhost", {
                 body: "foxes.mov",
                 external_url: "asdf",
                 info: {
@@ -221,8 +223,9 @@ describe("DiscordBot", () => {
                 width: 0,
             });
             await discordBot.OnMessage(msg);
-            mockBridge.botIntent.underlyingClient.wasCalled("uploadContent");
-            mockBridge.getIntent(author.id).wasCalled("sendEvent", true, "!asdf:localhost", {
+            const intent = mockBridge.getIntent(author.id);
+            intent.underlyingClient.wasCalled("uploadContent");
+            intent.wasCalled("sendEvent", true, "!asdf:localhost", {
                 body: "meow.mp3",
                 external_url: "asdf",
                 info: {
@@ -244,8 +247,9 @@ describe("DiscordBot", () => {
                 width: 0,
             });
             await discordBot.OnMessage(msg);
-            mockBridge.botIntent.underlyingClient.wasCalled("uploadContent");
-            mockBridge.getIntent(author.id).wasCalled("sendEvent", true, "!asdf:localhost", {
+            const intent = mockBridge.getIntent(author.id);
+            intent.underlyingClient.wasCalled("uploadContent");
+            intent.wasCalled("sendEvent", true, "!asdf:localhost", {
                 body: "meow.zip",
                 external_url: "asdf",
                 info: {