diff --git a/frontend/src/components/calendar/CalendarTree.tsx b/frontend/src/components/calendar/CalendarTree.tsx
index 4a9576a..7a5195c 100644
--- a/frontend/src/components/calendar/CalendarTree.tsx
+++ b/frontend/src/components/calendar/CalendarTree.tsx
@@ -128,9 +128,7 @@ function TypeSection({
               <CalendarRow
                 calendar={cal}
                 selected={activeCalendarId === cal.id}
-                visible={
-                  visibleCalendarIds.size === 0 || visibleCalendarIds.has(cal.id)
-                }
+                visible={visibleCalendarIds.has(cal.id)}
                 onSelect={() => onSelect(cal.id)}
                 onToggleVisibility={() => onToggleVisibility(cal.id)}
               />
diff --git a/frontend/src/store/calendarStore.ts b/frontend/src/store/calendarStore.ts
index 7a6d027..fe573d5 100644
--- a/frontend/src/store/calendarStore.ts
+++ b/frontend/src/store/calendarStore.ts
@@ -139,7 +139,13 @@ export const useCalendarStore = create<CalendarState>((set) => ({
     }),
 
   setActiveCalendarId: (id) => set({ activeCalendarId: id }),
-  setCalendars: (calendars) => set({ calendars }),
+  setCalendars: (calendars) => set((s) => {
+    // Initialize visibleCalendarIds with all calendar IDs if empty
+    const visibleCalendarIds = s.visibleCalendarIds.size === 0
+      ? new Set(calendars.map((c) => c.id))
+      : s.visibleCalendarIds;
+    return { calendars, visibleCalendarIds };
+  }),
   setSelectedEntry: (entry) => set({ selectedEntry: entry }),
   toggleCalendarVisibility: (id) =>
     set((s) => {