diff --git a/components/Fields/Field.vue b/components/Fields/Field.vue
index 1bab39e3f..8d81cc675 100644
--- a/components/Fields/Field.vue
+++ b/components/Fields/Field.vue
@@ -13,6 +13,7 @@ import OpeningHours, { isOpeningHoursSupportedOsmTags } from '~/components/Field
 import Phone from '~/components/Fields/Phone.vue'
 import RoutesField, { isRoutesFieldEmpty } from '~/components/Fields/RoutesField.vue'
 import Stars from '~/components/Fields/Stars.vue'
+import Website from '~/components/Fields/Website.vue'
 import ExternalLink from '~/components/UI/ExternalLink.vue'
 import FieldsHeader from '~/components/UI/FieldsHeader.vue'
 import type { ApiPoiProperties, FieldsListItem } from '~/lib/apiPois'
@@ -49,6 +50,7 @@ export default defineNuxtComponent({
     Instagram,
     ExternalLink,
     Stars,
+    Website,
   },
 
   emits: {
@@ -94,6 +96,9 @@ export default defineNuxtComponent({
     shortDescription(): string | undefined {
       return this.properties?.description?.replace(/(<([^>]+)>)/gi, '')
     },
+    isWebsite(): boolean {
+      return /\w*:?website:?\w*/.test(this.field.field)
+    },
   },
 
   methods: {
@@ -222,15 +227,7 @@ export default defineNuxtComponent({
         <Phone :number="phone" />
       </div>
 
-      <div
-        v-for="item in properties[field.field]"
-        v-else-if="field.field === 'website'"
-        :key="`website_${item}`"
-      >
-        <ExternalLink :href="item" target="_blank">
-          {{ item }}
-        </ExternalLink>
-      </div>
+      <Website v-else-if="isWebsite" :urls="properties[field.field]" />
 
       <div
         v-for="item in properties[field.field]"