diff --git a/app/javascript/dashboard/components-next/template-preview/DynamicMediaTemplate.vue b/app/javascript/dashboard/components-next/template-preview/DynamicMediaTemplate.vue
new file mode 100644
index 000000000..92a75442c
--- /dev/null
+++ b/app/javascript/dashboard/components-next/template-preview/DynamicMediaTemplate.vue
@@ -0,0 +1,66 @@
+<script setup>
+import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+
+const props = defineProps({
+  message: {
+    type: Object,
+    required: true,
+  },
+});
+
+// Determine media type based on URL or template data
+const getMediaType = () => {
+  if (props.message.originalTemplate?.header?.format) {
+    return props.message.originalTemplate.header.format.toLowerCase();
+  }
+
+  const url = props.message.image_url;
+  if (!url) return 'document';
+
+  if (url.includes('.pdf') || url.includes('pdf')) return 'document';
+  if (url.includes('.mp4') || url.includes('.mov') || url.includes('video'))
+    return 'video';
+  return 'image';
+};
+
+const mediaType = getMediaType();
+</script>
+
+<template>
+  <div
+    class="flex flex-col gap-2.5 p-3 rounded-xl bg-n-alpha-2 text-n-slate-12 max-w-80"
+  >
+    <!-- Image Media -->
+    <img
+      v-if="mediaType === 'image'"
+      :src="message.image_url"
+      class="object-cover w-full max-h-44 rounded-lg"
+      alt="Template media"
+    />
+
+    <!-- Video Media -->
+    <div
+      v-else-if="mediaType === 'video'"
+      class="overflow-hidden relative bg-gray-100 rounded-lg"
+    >
+      <video
+        :src="message.image_url"
+        class="object-cover w-full max-h-44"
+        controls
+        preload="metadata"
+      />
+    </div>
+
+    <!-- Document Media -->
+    <div v-else-if="mediaType === 'document'" class="flex items-center">
+      <FluentIcon icon="document" size="24" class="text-n-slate-12" />
+    </div>
+
+    <!-- Content Text -->
+    <span
+      v-if="message.content"
+      v-dompurify-html="message.content"
+      class="text-sm font-medium prose prose-bubble"
+    />
+  </div>
+</template>
diff --git a/app/javascript/dashboard/components-next/template-preview/TemplatePreview.vue b/app/javascript/dashboard/components-next/template-preview/TemplatePreview.vue
index 838aa0130..2091260d1 100644
--- a/app/javascript/dashboard/components-next/template-preview/TemplatePreview.vue
+++ b/app/javascript/dashboard/components-next/template-preview/TemplatePreview.vue
@@ -3,10 +3,10 @@ import { computed } from 'vue';
 import { TemplateNormalizer } from 'dashboard/services/TemplateNormalizer';
 
 import TextTemplate from 'dashboard/components-next/message/bubbles/Template/Text.vue';
-import MediaTemplate from 'dashboard/components-next/message/bubbles/Template/Media.vue';
 import QuickReplyTemplate from 'dashboard/components-next/message/bubbles/Template/QuickReply.vue';
 import CardTemplate from 'dashboard/components-next/message/bubbles/Template/Card.vue';
 import DynamicCallToActionTemplate from './DynamicCallToActionTemplate.vue';
+import DynamicMediaTemplate from './DynamicMediaTemplate.vue';
 
 const props = defineProps({
   template: {
@@ -89,15 +89,15 @@ const previewComponent = computed(() => {
     // WhatsApp components
     'whatsapp-text': TextTemplate,
     'whatsapp-text-header': TextTemplate,
-    'whatsapp-media-image': MediaTemplate,
-    'whatsapp-media-video': MediaTemplate,
-    'whatsapp-media-document': MediaTemplate,
+    'whatsapp-media-image': DynamicMediaTemplate,
+    'whatsapp-media-video': DynamicMediaTemplate,
+    'whatsapp-media-document': DynamicMediaTemplate,
     'whatsapp-interactive': DynamicCallToActionTemplate,
     'whatsapp-copy-code': DynamicCallToActionTemplate,
 
     // Twilio components
     'twilio-text': TextTemplate,
-    'twilio-media': MediaTemplate,
+    'twilio-media': DynamicMediaTemplate,
     'twilio-quick-reply': QuickReplyTemplate,
     'twilio-card': CardTemplate,
   };