diff --git a/src/components/Calendar/CalendarSelection.tsx b/src/components/Calendar/CalendarSelection.tsx
index e2ee2a6..72fea17 100644
--- a/src/components/Calendar/CalendarSelection.tsx
+++ b/src/components/Calendar/CalendarSelection.tsx
@@ -40,8 +40,9 @@ function CalendarAccordion({
   const allCalendars = useAppSelector((state) => state.calendars.list);
 
   const [expended, setExpended] = useState(defaultExpanded);
-  if (calendars.length === 0 && !showAddButton) return null;
   useEffect(() => setExpended(defaultExpanded), [defaultExpanded]);
+
+  if (calendars.length === 0 && !showAddButton) return null;
   return (
     <Accordion
       defaultExpanded={defaultExpanded}
diff --git a/src/components/Event/EventChip/EventChip.tsx b/src/components/Event/EventChip/EventChip.tsx
index b520f89..cb61602 100644
--- a/src/components/Event/EventChip/EventChip.tsx
+++ b/src/components/Event/EventChip/EventChip.tsx
@@ -65,11 +65,6 @@ export function EventChip({
     // Determine owner attendee
     const ownerAttendee = getOwnerAttendee(attendees, ownerEmails);
 
-    // Handle non-owner attendee case
-    if (attendees.length && !delegated && !ownerAttendee) {
-      return <SimpleEventChip title={event.title} />;
-    }
-
     // Color and contrast logic
     const bestColor = getBestColor(
       (calendar.color as { light: string; dark: string }) ?? {