diff --git a/src/components/Main/MainView/MessageElement/Embeddings/MessageOgpList.vue b/src/components/Main/MainView/MessageElement/Embeddings/MessageOgpList.vue
index ac9b309b5..a1d785a19 100644
--- a/src/components/Main/MainView/MessageElement/Embeddings/MessageOgpList.vue
+++ b/src/components/Main/MainView/MessageElement/Embeddings/MessageOgpList.vue
@@ -1,10 +1,11 @@
 <template>
   <div :class="$style.container">
     <MessageOgpListItem
-      v-for="(data, i) in ogpData"
-      :key="i"
+      v-for="(item, index) in ogpItems"
+      :key="`${item.url}-${index}`"
       :class="$style.item"
-      :ogp-data="data"
+      :url="item.url"
+      :ogp-data="item.ogpData"
     />
   </div>
 </template>
@@ -12,7 +13,6 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 
-import { isDefined } from '/@/lib/basic/array'
 import { useMessagesStore } from '/@/store/entities/messages'
 
 import MessageOgpListItem from './MessageOgpListItem.vue'
@@ -28,11 +28,14 @@ const props = withDefaults(
 
 const { ogpDataMap } = useMessagesStore()
 
-const ogpData = computed(() =>
-  props.externalUrls
-    .map(url => ogpDataMap.value.get(url))
-    .filter(isDefined)
-    .filter(o => o.title)
+const ogpItems = computed(() =>
+  props.externalUrls.flatMap(url => {
+    const ogpData = ogpDataMap.value.get(url)
+    if (!ogpData?.title) {
+      return []
+    }
+    return [{ url, ogpData }]
+  })
 )
 </script>
 
diff --git a/src/components/Main/MainView/MessageElement/Embeddings/MessageOgpListItem.vue b/src/components/Main/MainView/MessageElement/Embeddings/MessageOgpListItem.vue
index 7b615ea3c..4a5c29b0c 100644
--- a/src/components/Main/MainView/MessageElement/Embeddings/MessageOgpListItem.vue
+++ b/src/components/Main/MainView/MessageElement/Embeddings/MessageOgpListItem.vue
@@ -2,7 +2,7 @@
   <div :class="$style.container">
     <MessageOgpContentVideo
       v-if="isVideoType && imageUrl && videoUrl"
-      :url="ogpData.url"
+      :url="url"
       :title="ogpData.title"
       :description="ogpData.description"
       :preview-url="imageUrl"
@@ -10,7 +10,7 @@
     />
     <MessageOgpContentWebsite
       v-else
-      :url="ogpData.url"
+      :url="url"
       :title="ogpData.title"
       :description="ogpData.description"
       :image-url="imageUrl"
@@ -29,6 +29,7 @@ import MessageOgpContentVideo from './MessageOgpContentVideo.vue'
 import MessageOgpContentWebsite from './MessageOgpContentWebsite.vue'
 
 const props = defineProps<{
+  url: string
   ogpData: Ogp
 }>()