diff --git a/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue b/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
index c5abcb47c..92c4bc8b0 100644
--- a/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
+++ b/app/javascript/dashboard/components-next/message/chips/AttachmentChips.vue
@@ -1,8 +1,7 @@
 <script setup>
 import { computed, defineOptions, useAttrs } from 'vue';
 
-import ImageGrid from 'next/message/chips/AttachmentGrid.vue';
-import VideoGrid from 'next/message/chips/AttachmentGrid.vue';
+import ImageVideoChip from 'next/message/chips/AttachmentGrid.vue'; // Image and Video Grids are the same component
 import AudioChip from 'next/message/chips/Audio.vue';
 import FileChip from 'next/message/chips/File.vue';
 import { useMessageContext } from '../provider.js';
@@ -50,15 +49,15 @@ const allAttachments = computed(() => {
   return Array.isArray(props.attachments) ? props.attachments : [];
 });
 
-const imageAttachments = computed(() => {
-  return allAttachments.value.filter(
-    attachment => attachment.fileType === ATTACHMENT_TYPES.IMAGE
+const mediaAttachments = computed(() => {
+  const allowedTypes = [ATTACHMENT_TYPES.IMAGE, ATTACHMENT_TYPES.VIDEO];
+  const mediaTypes = allAttachments.value.filter(attachment =>
+    allowedTypes.includes(attachment.fileType)
   );
-});
 
-const videoAttachments = computed(() => {
-  return allAttachments.value.filter(
-    attachment => attachment.fileType === ATTACHMENT_TYPES.VIDEO
+  return mediaTypes.sort(
+    (a, b) =>
+      allowedTypes.indexOf(a.fileType) - allowedTypes.indexOf(b.fileType)
   );
 });
 
@@ -77,12 +76,8 @@ const files = computed(() => {
 
 <template>
   <div class="flex flex-col gap-2.5">
-    <div v-if="imageAttachments.length" :class="classToApply">
-      <ImageGrid :attachments="imageAttachments" type="image" />
-    </div>
-
-    <div v-if="videoAttachments.length" :class="classToApply">
-      <VideoGrid :attachments="videoAttachments" type="video" />
+    <div v-if="mediaAttachments.length" :class="classToApply">
+      <ImageVideoChip :attachments="mediaAttachments" />
     </div>
 
     <div v-if="recordings.length" :class="classToApply">
diff --git a/app/javascript/dashboard/components-next/message/chips/AttachmentGrid.vue b/app/javascript/dashboard/components-next/message/chips/AttachmentGrid.vue
index 21c4de2ed..6b1f439d1 100644
--- a/app/javascript/dashboard/components-next/message/chips/AttachmentGrid.vue
+++ b/app/javascript/dashboard/components-next/message/chips/AttachmentGrid.vue
@@ -3,16 +3,14 @@ import { computed } from 'vue';
 import ImageChip from './Image.vue';
 import VideoChip from './Video.vue';
 
+import { ATTACHMENT_TYPES } from '../constants';
+
 const props = defineProps({
   attachments: {
     type: Array,
     required: true,
     validator: value => Array.isArray(value) && value.length > 0,
   },
-  type: {
-    type: String,
-    default: 'image',
-  },
 });
 
 const MAX_DISPLAYED = 5;
@@ -56,6 +54,14 @@ const itemClass = computed(() => index => {
 const shouldShowOverlay = computed(
   () => index => remainingCount.value > 0 && index === MAX_DISPLAYED - 1
 );
+
+const componentMap = {
+  [ATTACHMENT_TYPES.IMAGE]: ImageChip,
+  [ATTACHMENT_TYPES.VIDEO]: VideoChip,
+};
+
+const getComponent = fileType =>
+  componentMap[fileType?.toLowerCase()] || componentMap[ATTACHMENT_TYPES.IMAGE];
 </script>
 
 <template>
@@ -66,7 +72,7 @@ const shouldShowOverlay = computed(
       :class="itemClass(index)"
     >
       <component
-        :is="type === 'image' ? ImageChip : VideoChip"
+        :is="getComponent(attachment.fileType)"
         :attachment="attachment"
         :remaining-count="remainingCount"
         :should-show-overlay="shouldShowOverlay(index)"