diff --git a/src/components/Event/EventFormFields.tsx b/src/components/Event/EventFormFields.tsx
index 0cef472..e0ecf0d 100644
--- a/src/components/Event/EventFormFields.tsx
+++ b/src/components/Event/EventFormFields.tsx
@@ -735,7 +735,7 @@ export default function EventFormFields({
           )}
           <Select
             labelId="calendar-select-label"
-            value={calendarid.toString()}
+            value={calendarid}
             label={!showMore ? "Calendar" : ""}
             displayEmpty
             onChange={(e: SelectChangeEvent) =>
diff --git a/src/features/Events/EventModal.tsx b/src/features/Events/EventModal.tsx
index aa863d9..53cdb3f 100644
--- a/src/features/Events/EventModal.tsx
+++ b/src/features/Events/EventModal.tsx
@@ -140,7 +140,7 @@ function EventPopover({
     setLocation("");
     setStart("");
     setEnd("");
-    setCalendarid(userPersonnalCalendars[0].id);
+    setCalendarid(userPersonnalCalendars[0]?.id);
     setAllDay(false);
     setRepetition({} as RepetitionObject);
     setAlarm("");