diff --git a/app/components/global/AddCard.vue b/app/components/global/card/Add.vue
similarity index 100%
rename from app/components/global/AddCard.vue
rename to app/components/global/card/Add.vue
diff --git a/app/components/global/card/Error.vue b/app/components/global/card/Error.vue
new file mode 100644
index 0000000..9dcc910
--- /dev/null
+++ b/app/components/global/card/Error.vue
@@ -0,0 +1,22 @@
+<script lang="ts" setup>
+import { PhCloudX } from '@phosphor-icons/vue';
+</script>
+
+<template>
+  <UiCard class="w-full h-full flex flex-col border-rose-200 bg-rose-50 dark:border-rose-900 dark:bg-rose-950">
+    <template v-if="$slots.title">
+      <UiCardHeader class="flex-row items-center gap-2">
+        <PhCloudX :size="32"/>
+
+        <UiCardTitle>
+          <slot name="title" />
+        </UiCardTitle>
+      </UiCardHeader>
+    </template>
+    <template v-if="$slots.content">
+      <UiCardContent class="grow grid gap-2">
+        <slot name="content" />
+      </UiCardContent>
+    </template>
+  </UiCard>
+</template>
diff --git a/app/components/global/LoadingCard.vue b/app/components/global/card/Loading.vue
similarity index 100%
rename from app/components/global/LoadingCard.vue
rename to app/components/global/card/Loading.vue
diff --git a/app/components/world/form/Update.vue b/app/components/world/form/Update.vue
index fb1e470..0c3e593 100644
--- a/app/components/world/form/Update.vue
+++ b/app/components/world/form/Update.vue
@@ -38,6 +38,8 @@ async function handleSubmit() {
 
   if (error) {
     console.log(error.message)
+    isLoading.value = false
+    return
   }
 
   toast({
diff --git a/app/pages/explore.vue b/app/pages/explore.vue
index 29a1d42..0a3e1ea 100644
--- a/app/pages/explore.vue
+++ b/app/pages/explore.vue
@@ -34,7 +34,7 @@ const { data: calendars, status } = useLazyAsyncData<{ data: Calendar[] }>("expl
         </Heading>
 
           <div v-if="status === 'pending'" class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-2">
-            <LazyLoadingCard />
+            <LazyCardLoading />
           </div>
 
           <template v-else-if="status === 'success' && calendars?.data">
diff --git a/app/pages/my/index.vue b/app/pages/my/index.vue
index b54118e..d695bc3 100644
--- a/app/pages/my/index.vue
+++ b/app/pages/my/index.vue
@@ -100,21 +100,21 @@ function hideEditModal() {
         </div>
 
         <div v-if="isLoading" class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-2">
-          <LoadingCard />
+          <LazyCardLoading />
         </div>
         <ul v-else-if="worlds?.data" class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-2">
           <li v-for="world in sortedWorlds" :key="world.id">
             <WorldPreviewCard :world="world" @on-edit="() => deployEditModal(world)" @on-delete="() => deployDeleteModal(world)" />
           </li>
           <li class="xl:w-fit">
-            <AddCard @on-click="() => isCreateWorldModalOpen = true">
+            <LazyCardAdd @on-click="() => isCreateWorldModalOpen = true">
               <template v-if="worlds?.data?.length > 0">
                 {{ $t('entity.world.addSingle') }}
               </template>
               <template v-else>
                 {{ $t('entity.world.addSingleFirst') }}
               </template>
-            </AddCard>
+            </LazyCardAdd>
           </li>
         </ul>
       </Spacing>
diff --git a/app/pages/my/worlds/[id].vue b/app/pages/my/worlds/[id].vue
index 23d15b8..6258290 100644
--- a/app/pages/my/worlds/[id].vue
+++ b/app/pages/my/worlds/[id].vue
@@ -8,13 +8,6 @@ const supabase = useSupabaseClient()
 const route = useRoute()
 const id = route.params.id
 
-const { data: world, status, refresh } = await useLazyFetch<{ data: World }>("/api/worlds/query", { query: { id, full: true }, key: "user-world", keepalive: true })
-const sortedCalendars = computed(() => world.value?.data.calendars ? [...world.value.data.calendars].sort((a, b) => (a.id ?? 0) - (b.id ?? 0)) : [])
-
-definePageMeta({
-  middleware: ["auth-guard"]
-})
-
 const user = useSupabaseUser()
 
 // Redirect user back home when they log out on the page
@@ -24,44 +17,45 @@ watch(user, (n) => {
   }
 })
 
+definePageMeta({
+  middleware: ["auth-guard"]
+})
+
+const { data: world, status, refresh } = await useAsyncData<{ data: World }>('user-world', () => {
+  return $fetch("/api/worlds/query", { query: { id }})
+})
+const worldGmId = world.value?.data.gmId
+
+const { data: calendars, status: calendarStatus, refresh: refreshCalendars } = useLazyFetch<{ data: Calendar[] }>('/api/calendars/query', { query: { worldId: world.value?.data.id, full: true }})
+const sortedCalendars = computed(() => calendars.value?.data ? calendars.value.data.sort((a, b) => (a.id ?? 0) - (b.id ?? 0)) : [])
+
 /**
  * === Subscriptions ===
  */
-/** Active calendar channel */
 let calendarChannel: RealtimeChannel
-/** Active world channel */
 let worldChannel: RealtimeChannel
 
-onMounted(() => {
-  calendarChannel = supabase.channel("realtime-calendar-channel")
-    .on(
-      "postgres_changes",
-      { event: "*", schema: "public", table: "calendars" },
-      async (payload) => {
-        console.log("refresh")
-        refresh()
-      }
-    )
-    .subscribe()
-})
-onUnmounted(() => {
-  // Unsubscribe from realtime
-  supabase.removeChannel(calendarChannel)
-})
-
+// Register channels
 onMounted(() => {
   worldChannel = supabase.channel("realtime-world-channel")
     .on(
       "postgres_changes",
       { event: "*", schema: "public", table: "worlds" },
-      async (payload) => {
-        refresh()
-      }
+      async () => refresh()
+    )
+    .subscribe()
+  calendarChannel = supabase.channel("realtime-calendar-channel")
+    .on(
+      "postgres_changes",
+      { event: "*", schema: "public", table: "calendars" },
+      async () => refreshCalendars()
     )
     .subscribe()
 })
+
+// Unsubscribe from realtime
 onUnmounted(() => {
-  // Unsubscribe from realtime
+  supabase.removeChannel(calendarChannel)
   supabase.removeChannel(worldChannel)
 })
 
@@ -108,11 +102,60 @@ function hideEditModal() {
         <Title>{{ $t("entity.world.namePlural") }}</Title>
       </Head>
 
-      <Heading level="h1">
-        {{ $t('entity.isLoading') }}
-      </Heading>
+      <header class="mb-8">
+        <Spacing size="lg">
+          <Breadcrumb
+            :items="[]"
+          />
+
+          <div class="lg:w-1/2">
+            <div class="flex items-center gap-2 mb-2">
+              <div class="flex items-center gap-3">
+                <UiSkeleton class="h-10 w-32 max-md:max-w-full" />
+              </div>
+
+              <UiButton size="icon" class="rounded-full size-8" disabled>
+                <PhPencil size="17" weight="fill" />
+              </UiButton>
+            </div>
+
+            <div class="grid gap-1">
+              <UiSkeleton class="h-6 w-full max-md:max-w-full" />
+              <UiSkeleton class="h-6 w-8/12 max-md:max-w-full" />
+              <UiSkeleton class="h-6 w-7/12 max-md:max-w-full" />
+            </div>
+          </div>
+        </Spacing>
+      </header>
     </template>
-    <template v-else-if="world?.data">
+    <template v-else-if="!world?.data && status === 'error'">
+      <div class="h-full w-full grid place-items-center">
+        <Head>
+          <Title>{{ $t("entity.world.notFound") }}</Title>
+        </Head>
+
+        <div class="grid justify-items-center opacity-80">
+          <PhGlobeHemisphereWest size="75" class="opacity-60" weight="fill" />
+
+          <Heading level="h1">
+            {{ $t("entity.world.notFound") }}
+          </Heading>
+
+          <p>
+            {{ $t('entity.world.notFoundDescription') }}
+          </p>
+
+          <UiButton variant="default" class="mt-4 gap-2" as-child>
+            <RouterLink to="/my">
+              <PhArrowBendDoubleUpLeft size="24" />
+
+              {{ $t('entity.world.backToList') }}
+            </RouterLink>
+          </UiButton>
+        </div>
+      </div>
+    </template>
+    <template v-else-if="world?.data && status === 'success'">
       <Head>
         <Title>{{ world.data.name }}</Title>
       </Head>
@@ -151,70 +194,71 @@ function hideEditModal() {
           </div>
         </Spacing>
       </header>
+    </template>
 
-      <section>
-        <Spacing size="lg">
-          <div class="flex items-center gap-3">
-            <Heading level="h2">
-              {{ $t('entity.calendar.namePlural') }}
-            </Heading>
+    <template v-if="world?.data">
+      <LazyWorldDialogEdit :world="world.data" :modal-state="isEditWorldModalOpen" @on-close="hideEditModal" />
+      <LazyCalendarDialogCreate :world="world.data" :modal-state="isCreateCalendarModalOpen" @on-close="hideCreateDialog" />
+      <LazyCalendarDialogUpdate :world="world.data" :calendar="markedCalendar" :modal-state="isUpdateCalendarModalOpen" @on-close="hideUpdateDialog" />
+      <LazyCalendarDialogDelete :calendar="markedCalendar" :modal-state="isDeleteCalendarModalOpen" @on-close="hideDeleteCalendarModal"/>
+    </template>
+
+    <section>
+      <Spacing size="lg">
+        <div class="flex items-center gap-3">
+          <Heading level="h2">
+            {{ $t('entity.calendar.namePlural') }}
+          </Heading>
+        </div>
+
+        <template v-if="calendarStatus === 'pending'">
+          <ul class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-2">
+            <li>
+              <LazyCardLoading />
+            </li>
+            <li class="w-64 max-w-full">
+              <LazyCardLoading />
+            </li>
+          </ul>
+        </template>
+
+        <template v-else-if="!calendars?.data && calendarStatus === 'error'">
+          <div class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3">
+            <LazyCardError>
+              <template #title>
+                {{ $t('error.default.title') }}
+              </template>
+              <template #content>
+                {{ $t('entity.calendar.error.cannotFindAny') }}
+              </template>
+            </LazyCardError>
           </div>
+        </template>
 
+        <template v-else-if="calendars?.data && calendarStatus === 'success' && worldGmId">
           <ul class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-2">
             <li v-for="calendar in sortedCalendars" :key="calendar.id">
-              <CalendarPreviewCard
+              <LazyCalendarPreviewCard
                 :calendar="calendar"
-                :gm-id="world.data.gmId"
+                :gm-id="worldGmId"
                 show-actions
                 @on-edit="() => deployUpdateDialog(calendar)"
                 @on-delete="() => deployDeleteCalendarModal(calendar)" />
             </li>
 
             <li class="xl:w-fit">
-              <AddCard @on-click="() => isCreateCalendarModalOpen = true">
+              <LazyCardAdd @on-click="() => isCreateCalendarModalOpen = true">
                 <template v-if="sortedCalendars.length > 0">
                   {{ $t('entity.calendar.addSingle') }}
                 </template>
                 <template v-else>
                   {{ $t('entity.calendar.addSingleFirst') }}
                 </template>
-              </AddCard>
+              </LazyCardAdd>
             </li>
           </ul>
-        </Spacing>
-      </section>
-
-      <WorldDialogEdit :world="world.data" :modal-state="isEditWorldModalOpen" @on-close="hideEditModal" />
-      <CalendarDialogCreate :world="world.data" :modal-state="isCreateCalendarModalOpen" @on-close="hideCreateDialog" />
-      <CalendarDialogUpdate :world="world.data" :calendar="markedCalendar" :modal-state="isUpdateCalendarModalOpen" @on-close="hideUpdateDialog" />
-      <CalendarDialogDelete :calendar="markedCalendar" :modal-state="isDeleteCalendarModalOpen" @on-close="hideDeleteCalendarModal"/>
-    </template>
-    <template v-else>
-      <div class="h-full w-full grid place-items-center">
-        <Head>
-          <Title>{{ $t("entity.world.notFound") }}</Title>
-        </Head>
-
-        <div class="grid justify-items-center opacity-80">
-          <PhGlobeHemisphereWest size="75" class="opacity-60" weight="fill" />
-
-          <Heading level="h1">
-            {{ $t("entity.world.notFound") }}
-          </Heading>
-
-          <p>
-            {{ $t('entity.world.notFoundDescription') }}
-          </p>
-
-          <UiButton variant="default" class="mt-4 gap-2" as-child>
-            <RouterLink to="/my">
-              <PhArrowBendDoubleUpLeft size="24" />
-
-              {{ $t('entity.world.backToList') }}
-            </RouterLink>
-          </UiButton>
-        </div>
-      </div>
-    </template>
+        </template>
+      </Spacing>
+    </section>
   </main>
 </template>
diff --git a/i18n/i18n.config.ts b/i18n/i18n.config.ts
index 42651e7..c82fa02 100644
--- a/i18n/i18n.config.ts
+++ b/i18n/i18n.config.ts
@@ -241,6 +241,9 @@ export default defineI18nConfig(() => ({
               title: "The event \"{event}\" has been successfuly deleted.",
             },
           },
+          error: {
+            cannotFindAny: "We couldn't fetch your calendars…"
+          },
           actionDialog: {
             tabs: {
               general: {
@@ -571,6 +574,9 @@ export default defineI18nConfig(() => ({
               title: "L'évènement \"{event}\" a été supprimé avec succès.",
             },
           },
+          error: {
+            cannotFindAny: "Nous n'avons pas pu récupérer vos calendriers…"
+          },
           actionDialog: {
             tabs: {
               general: {
diff --git a/nuxt.config.ts b/nuxt.config.ts
index bfc0bd5..6c03ccc 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -69,4 +69,4 @@ export default defineNuxtConfig({
 
   eslint: {},
   compatibilityDate: "latest",
-})
\ No newline at end of file
+})
diff --git a/server/api/worlds/query.get.ts b/server/api/worlds/query.get.ts
index d0e3b8f..fedd802 100644
--- a/server/api/worlds/query.get.ts
+++ b/server/api/worlds/query.get.ts
@@ -41,12 +41,7 @@ export default defineEventHandler(async (event) => {
     state,
     createdAt:created_at,
     updatedAt:updated_at,
-    calendars (
-      createdAt:created_at,
-      updatedAt:updated_at,
-      months:calendar_months(*),
-      eventNb:calendar_events(count)
-    )
+    gmId:gm_id
   `
 
   let output