diff --git a/apps/web/pages/settings/my-account/conferencing.tsx b/apps/web/pages/settings/my-account/conferencing.tsx
index f5a487596d..4adb47c02c 100644
--- a/apps/web/pages/settings/my-account/conferencing.tsx
+++ b/apps/web/pages/settings/my-account/conferencing.tsx
@@ -69,7 +69,10 @@ const ConferencingLayout = () => {
   }, []);
 
   const updateDefaultAppMutation = trpc.viewer.updateUserDefaultConferencingApp.useMutation({
-    onSuccess: onSuccessCallback,
+    onSuccess: async () => {
+      await utils.viewer.getUsersDefaultConferencingApp.invalidate();
+      onSuccessCallback();
+    },
     onError: (error) => {
       showToast(`Error: ${error.message}`, "error");
     },
diff --git a/packages/features/eventtypes/components/BulkEditDefaultConferencingModal.tsx b/packages/features/eventtypes/components/BulkEditDefaultConferencingModal.tsx
index d0bf656e19..bea7a9f345 100644
--- a/packages/features/eventtypes/components/BulkEditDefaultConferencingModal.tsx
+++ b/packages/features/eventtypes/components/BulkEditDefaultConferencingModal.tsx
@@ -37,7 +37,8 @@ export function BulkEditDefaultConferencingModal(props: { open: boolean; setOpen
       <DialogContent
         type="creation"
         title={t("default_conferencing_bulk_title")}
-        description={t("default_conferencing_bulk_description")}>
+        description={t("default_conferencing_bulk_description")}
+        enableOverflow>
         <Form
           form={form}
           handleSubmit={(values) => {
diff --git a/packages/trpc/server/routers/viewer/eventTypes.ts b/packages/trpc/server/routers/viewer/eventTypes.ts
index b1d6abbf64..f5a676676c 100644
--- a/packages/trpc/server/routers/viewer/eventTypes.ts
+++ b/packages/trpc/server/routers/viewer/eventTypes.ts
@@ -844,8 +844,14 @@ export const eventTypesRouter = router({
     });
 
     const eventTypesWithLogo = eventTypes.map((eventType) => {
-      const locationParsed = eventTypeLocationsSchema.parse(eventType.locations);
-      const app = getAppFromLocationValue(locationParsed[0].type);
+      const locationParsed = eventTypeLocationsSchema.safeParse(eventType.locations);
+
+      // some events has null as location for legacy reasons, so this fallbacks to daily video
+      const app = getAppFromLocationValue(
+        locationParsed.success && locationParsed.data?.[0]?.type
+          ? locationParsed.data[0].type
+          : "integrations:daily"
+      );
       return {
         ...eventType,
         logo: app?.logo,
@@ -856,6 +862,7 @@ export const eventTypesRouter = router({
       eventTypes: eventTypesWithLogo,
     };
   }),
+
   bulkUpdateToDefaultLocation: authedProcedure
     .input(
       z.object({