diff --git a/components/calendar/category/Table.vue b/components/calendar/category/Table.vue
index f048008..bf22252 100644
--- a/components/calendar/category/Table.vue
+++ b/components/calendar/category/Table.vue
@@ -6,9 +6,7 @@ const { categories } = defineProps<{
   categories: Category[]
 }>()
 
-const sortedCategories = computed(() => {
-  return categories.toSorted((a, b) => a.name.localeCompare(b.name))
-})
+const sortedCategories = computed(() => categories.toSorted((a, b) => a.name.localeCompare(b.name)))
 </script>
 
 <template>
diff --git a/pages/my/calendars/[id].vue b/pages/my/calendars/[id].vue
index 7291f2d..a515e64 100644
--- a/pages/my/calendars/[id].vue
+++ b/pages/my/calendars/[id].vue
@@ -41,12 +41,11 @@ const {
 const isLoading = computed(() => calendarStatus.value === "pending" || categoriesStatus.value === "pending")
 
 const { setActiveCalendar } = useCalendar()
-watch(isLoading, (n) => {
-  if (!n && calendar.value?.data && categories.value?.data) {
+watch([calendar, categories], () => {
+  if (calendar.value?.data && categories.value?.data) {
     setActiveCalendar(calendar.value?.data, categories.value.data)
   }
-}, { immediate: true }
-)
+}, { immediate: true })
 </script>
 
 <template>
diff --git a/stores/CalendarStore.ts b/stores/CalendarStore.ts
index 3799877..c5f775b 100644
--- a/stores/CalendarStore.ts
+++ b/stores/CalendarStore.ts
@@ -918,11 +918,10 @@ export const useCalendar = defineStore("calendar", () => {
    */
   function updateAllEventsCategories(categories: Category[]) {
     baseEvents.value.forEach((event) => {
-      if (event.category?.id) {
-        const category = categories.find((c) => c.id === event.category?.id)
-        if (category) {
-          event.category = category
-        }
+      const category = categories.find((c) => c.id === event.category?.id)
+
+      if (category && event.category?.id) {
+        event.category = category
       }
     })
   }