diff --git a/packages/server/src/routes/dm.ts b/packages/server/src/routes/dm.ts
index 7aef41bb..23416951 100644
--- a/packages/server/src/routes/dm.ts
+++ b/packages/server/src/routes/dm.ts
@@ -88,6 +88,9 @@ export function buildDmMessageWithUser(
       mimetype: a.mimetype,
       size: a.size,
       thumbnailFilename: a.thumbnailFilename ?? null,
+      width: a.width ?? null,
+      height: a.height ?? null,
+      duration: a.duration ?? null,
       createdAt: a.createdAt,
     })),
     embeds: embedRows.map(e => embedRowToEmbed(e)),
diff --git a/packages/server/src/routes/messages.ts b/packages/server/src/routes/messages.ts
index ec620ee1..a8ef8435 100644
--- a/packages/server/src/routes/messages.ts
+++ b/packages/server/src/routes/messages.ts
@@ -114,6 +114,10 @@ export function fetchReplyToMessages(messages: (typeof schema.messages.$inferSel
         originalName: a.originalName,
         mimetype: a.mimetype,
         size: a.size,
+        thumbnailFilename: a.thumbnailFilename ?? null,
+        width: a.width ?? null,
+        height: a.height ?? null,
+        duration: a.duration ?? null,
         createdAt: a.createdAt,
       })),
       embeds: [],
@@ -149,6 +153,9 @@ export function buildMessageWithUser(
       mimetype: a.mimetype,
       size: a.size,
       thumbnailFilename: a.thumbnailFilename ?? null,
+      width: a.width ?? null,
+      height: a.height ?? null,
+      duration: a.duration ?? null,
       createdAt: a.createdAt,
     })),
     embeds: embedRows.map(e => embedRowToEmbed(e)),
diff --git a/packages/server/src/ws/events.ts b/packages/server/src/ws/events.ts
index 404d46c3..42ffb3a3 100644
--- a/packages/server/src/ws/events.ts
+++ b/packages/server/src/ws/events.ts
@@ -62,6 +62,9 @@ function getMessageWithUser(messageId: string): MessageWithUser | null {
     mimetype: a.mimetype,
     size: a.size,
     thumbnailFilename: a.thumbnailFilename ?? null,
+    width: a.width ?? null,
+    height: a.height ?? null,
+    duration: a.duration ?? null,
     createdAt: a.createdAt,
   }));