diff --git a/.changeset/fix-mentions-in-non-text-reply.md b/.changeset/fix-mentions-in-non-text-reply.md
new file mode 100644
index 0000000000..49ce995c08
--- /dev/null
+++ b/.changeset/fix-mentions-in-non-text-reply.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fix mentions not sending in non-textual replies
diff --git a/src/app/features/room/RoomInput.tsx b/src/app/features/room/RoomInput.tsx
index f3897edc1a..2f02a58224 100644
--- a/src/app/features/room/RoomInput.tsx
+++ b/src/app/features/room/RoomInput.tsx
@@ -613,6 +613,8 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
           plainText?.length === 0 ? getReplyContent(replyDraft, room) : undefined;
         if (replyContent) {
           contents[0]!['m.relates_to'] = replyContent;
+          if (!silentReply && replyDraft)
+            contents[0]!['m.mentions'] = { ['user_ids']: [replyDraft.userId] };
           setReplyDraft(replyDraftBase);
         }
       }
@@ -1295,6 +1297,8 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
 
       if (replyDraft) {
         content['m.relates_to'] = getReplyContent(replyDraft, room);
+        if (!silentReply && replyDraft)
+          content['m.mentions'] = { ['user_ids']: [replyDraft.userId] };
         setReplyDraft(replyDraftBase);
       }
       mx.sendEvent(roomId, EventType.Sticker, content);