diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts
index cd85da90..eda8e895 100644
--- a/packages/core.gbapp/services/GBConversationalService.ts
+++ b/packages/core.gbapp/services/GBConversationalService.ts
@@ -651,8 +651,8 @@ export class GBConversationalService {
       text.toLowerCase().endsWith('.png') ||
       text.toLowerCase().endsWith('.mp4') ||
       text.toLowerCase().endsWith('.mov');
-    let mediaType = text.toLowerCase().endsWith('.mp4') || text.toLowerCase().endsWith('.mov') ? 'video' : 'image';
     let mediaFile = !isMedia ? /(.*)\n/gim.exec(text)[0].trim() : text;
+    let mediaType = mediaFile.toLowerCase().endsWith('.mp4') || text.toLowerCase().endsWith('.mov') ? 'video' : 'image';
 
     // Set folder based on media type
     const folder = mediaType === 'video' ? 'videos' : 'images';
@@ -681,8 +681,7 @@ export class GBConversationalService {
         }
       ]
     };
-    data['components'][0]['parameters'][0][mediaType] = {link: urlMedia};
-
+    data['components'][0]['parameters'][0][mediaType] = { link: urlMedia };
 
     await this.sendToMobile(min, mobile, data, null);
     GBLogEx.info(min, `Sending answer file to mobile: ${mobile}. Header: ${urlMedia}`);
diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
index 589ad6ea..2cee0db0 100644
--- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
+++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
@@ -758,8 +758,8 @@ export class WhatsappDirectLine extends GBService {
       text.toLowerCase().endsWith('.png') ||
       text.toLowerCase().endsWith('.mp4') ||
       text.toLowerCase().endsWith('.mov');
-    let mediaType = text.toLowerCase().endsWith('.mp4') || text.toLowerCase().endsWith('.mov') ? 'video' : 'image';
-    let mediaFile = /(.*)\n/gim.exec(text)[0].trim();
+      let mediaFile = /(.*)\n/gim.exec(text)[0].trim();
+      let mediaType = mediaFile.toLowerCase().endsWith('.mp4') || text.toLowerCase().endsWith('.mov') ? 'video' : 'image';
 
     // Set folder based on media type
     let folder = mediaType === 'video' ? 'videos' : 'images';