diff --git a/__test__/features/Events/EventDisplay.test.tsx b/__test__/features/Events/EventDisplay.test.tsx
index b210ee0..d69b891 100644
--- a/__test__/features/Events/EventDisplay.test.tsx
+++ b/__test__/features/Events/EventDisplay.test.tsx
@@ -991,6 +991,7 @@ describe("Event Full Display", () => {
                 ],
                 organizer: {
                   cal_address: "organizer@test.com",
+                  cn: "Edgar Organiser",
                 },
               },
             },
diff --git a/__test__/features/Events/EventModal.test.tsx b/__test__/features/Events/EventModal.test.tsx
index bb95e68..fdb4f16 100644
--- a/__test__/features/Events/EventModal.test.tsx
+++ b/__test__/features/Events/EventModal.test.tsx
@@ -122,7 +122,6 @@ describe("EventPopover", () => {
     expect(screen.getByLabelText("Alarm")).toBeInTheDocument();
     expect(screen.getByLabelText("Visibility")).toBeInTheDocument();
     expect(screen.getByLabelText("is Busy")).toBeInTheDocument();
-    expect(screen.getByLabelText("Time Zone")).toBeInTheDocument();
     // Calendar options
     const select = screen.getByLabelText("Calendar");
     fireEvent.mouseDown(select);
diff --git a/src/features/Events/EventDisplay.tsx b/src/features/Events/EventDisplay.tsx
index a586f47..7ad117d 100644
--- a/src/features/Events/EventDisplay.tsx
+++ b/src/features/Events/EventDisplay.tsx
@@ -111,9 +111,10 @@ export default function EventDisplayModal({
     (person) => person.cal_address === user.userData.email
   );
 
-  const organizer = event?.attendee?.find(
-    (a) => a.cal_address === event?.organizer?.cal_address
-  );
+  const organizer =
+    event.attendee?.find(
+      (a) => a.cal_address === event?.organizer?.cal_address
+    ) ?? ({} as userAttendee);
 
   const isOwn = organizer?.cal_address === user.userData.email;
   const isOwnCal = userPersonnalCalendars.find((cal) => cal.id === calId);
@@ -155,17 +156,7 @@ export default function EventDisplayModal({
       class: eventClass,
       organizer: event.organizer,
       timezone,
-      attendee: [
-        {
-          cn: event.organizer?.cn,
-          cal_address: event.organizer?.cal_address ?? "",
-          partstat: "ACCEPTED",
-          rsvp: "FALSE",
-          role: "CHAIR",
-          cutype: "INDIVIDUAL",
-        },
-        ...attendees,
-      ],
+      attendee: [organizer, ...attendees],
       transp: "OPAQUE",
       color: userPersonnalCalendars[calendarid]?.color,
     };
@@ -411,7 +402,8 @@ export default function EventDisplayModal({
           {event.attendee?.length > 0 && (
             <Box sx={{ mb: 1 }}>
               <Typography variant="subtitle2">Attendees:</Typography>
-              {organizer && renderAttendeeBadge(organizer, "org", true)}
+              {organizer.cal_address &&
+                renderAttendeeBadge(organizer, "org", true)}
               {(showAllAttendees
                 ? attendees
                 : attendees.slice(0, attendeeDisplayLimit)