diff --git a/components/PoisDetails/PoiDetails.vue b/components/PoisDetails/PoiDetails.vue
index 4b99b6f9..b36366db 100644
--- a/components/PoisDetails/PoiDetails.vue
+++ b/components/PoisDetails/PoiDetails.vue
@@ -11,11 +11,10 @@ import IconButton from '~/components/UI/IconButton.vue'
 import RelativeDate from '~/components/UI/RelativeDate.vue'
 import TeritorioIcon from '~/components/UI/TeritorioIcon.vue'
 import TeritorioIconBadge from '~/components/UI/TeritorioIconBadge.vue'
-import type { ContentEntry } from '~/lib/apiContent'
 import type { ApiPoiDeps } from '~/lib/apiPoiDeps'
 import type { ApiPoi, FieldsList } from '~/lib/apiPois'
-import type { Settings } from '~/lib/apiSettings'
 import { favoriteStore as useFavoriteStore } from '~/stores/favorite'
+import { siteStore as useSiteStore } from '~/stores/site'
 import { OriginEnum } from '~/utils/types'
 import FieldsHeader from '~/components/UI/FieldsHeader.vue'
 import ContribFieldGroup from '~/components/Fields/ContribFieldGroup.vue'
@@ -26,8 +25,6 @@ import Footer from '~/components/Layout/Footer.vue'
 // Props
 //
 const props = defineProps<{
-  settings: Settings
-  navMenuEntries: ContentEntry[]
   poi: ApiPoi
   poiDeps?: ApiPoiDeps
   pageTitle: string
@@ -40,6 +37,7 @@ const router = useRouter()
 const route = useRoute()
 const { $tracking } = useNuxtApp()
 const { t } = useI18n()
+const { settings, contents } = storeToRefs(useSiteStore())
 const { contribMode, isContribEligible, getContributorFields } = useContrib()
 const favoriteStore = useFavoriteStore()
 const { favoritesIds, favoriteAddresses } = storeToRefs(favoriteStore)
@@ -48,7 +46,7 @@ const { favoritesIds, favoriteAddresses } = storeToRefs(favoriteStore)
 // Computed
 //
 const favoritesModeEnabled = computed(() => {
-  return props.settings.themes[0]?.favorites_mode ?? true
+  return settings.value?.themes[0]?.favorites_mode ?? true
 })
 
 const isLargeLayeout = computed(() => {
@@ -151,8 +149,8 @@ function back() {
 <template>
   <VContainer>
     <Header
-      :theme="settings.themes[0]"
-      :nav-menu-entries="navMenuEntries"
+      :theme="settings?.themes[0]"
+      :nav-menu-entries="contents!"
       :color-line="colorLine"
     >
       <IconButton
@@ -219,7 +217,7 @@ function back() {
 
         <template v-if="!isLargeLayeout">
           <MapPois
-            :extra-attributions="settings.attributions"
+            :extra-attributions="settings?.attributions"
             :feature-ids="[id]"
             :features="[poi]"
             class="tw-relative poi-map"
@@ -258,7 +256,7 @@ function back() {
       :color-line="colorLine"
       :favorites-mode-enabled="favoritesModeEnabled"
     />
-    <Footer :attributions="settings.attributions">
+    <Footer :attributions="settings?.attributions">
       <span v-if="poi.properties.metadata.updated_at">
         {{ t('poiDetails.lastUpdate') }}
         <a
diff --git a/pages/poi/[id]/details.vue b/pages/poi/[id]/details.vue
index 5a6fd816..833c6f7b 100644
--- a/pages/poi/[id]/details.vue
+++ b/pages/poi/[id]/details.vue
@@ -23,7 +23,7 @@ definePageMeta({
 // Composables
 //
 const siteStore = useSiteStore()
-const { config, settings, contents } = storeToRefs(siteStore)
+const { config, settings } = storeToRefs(siteStore)
 const { params } = useRoute()
 const { $trackingInit } = useNuxtApp()
 
@@ -92,10 +92,7 @@ useHead(
 
 <template>
   <PoiDetails
-    v-if="settings"
-    :settings="settings"
-    :nav-menu-entries="contents!"
-    :poi="poi!"
+    :poi="poi"
     :poi-deps="poiDeps"
     :page-title="featureSeoTitle!"
     class="page-details tw-overflow-clip"