diff --git a/src/modules/whatsapp/whatsapp.service.ts b/src/modules/whatsapp/whatsapp.service.ts
index e19b86c..ea7dce2 100644
--- a/src/modules/whatsapp/whatsapp.service.ts
+++ b/src/modules/whatsapp/whatsapp.service.ts
@@ -87,8 +87,10 @@ export class WhatsappService {
       body: row.body ?? '',
       fromMe: Boolean(row.from_me),
       timestamp: Number(row.timestamp),
-      hasMedia: row.type !== 'text',
+      hasMedia: Boolean(row.media_path || row.type !== 'text'),
       media: null,
+      mediaUrl: row.media_path ? this.mediaStorageService.getUrl(row.media_path) : null,
+      mediaMimeType: row.media_mime_type ?? null,
       chatId: row.chat_id,
       status: row.status,
     }));