diff --git a/apps/web/components/apps/AppList.tsx b/apps/web/components/apps/AppList.tsx
index 55206c8f04..e7eda10f0a 100644
--- a/apps/web/components/apps/AppList.tsx
+++ b/apps/web/components/apps/AppList.tsx
@@ -48,6 +48,7 @@ export const AppList = ({ data, handleDisconnect, variant, listClassName }: AppL
     onSuccess: () => {
       showToast("Default app updated successfully", "success");
       utils.viewer.getUsersDefaultConferencingApp.invalidate();
+      setBulkUpdateModal(true);
     },
     onError: (error) => {
       showToast(`Error: ${error.message}`, "error");
@@ -98,7 +99,6 @@ export const AppList = ({ data, handleDisconnect, variant, listClassName }: AppL
                             updateDefaultAppMutation.mutate({
                               appSlug,
                             });
-                            setBulkUpdateModal(true);
                           }
                         }}>
                         {t("set_as_default")}
diff --git a/packages/features/eventtypes/components/BulkEditDefaultForEventsModal.tsx b/packages/features/eventtypes/components/BulkEditDefaultForEventsModal.tsx
index 76b18b985c..5f3482dfd9 100644
--- a/packages/features/eventtypes/components/BulkEditDefaultForEventsModal.tsx
+++ b/packages/features/eventtypes/components/BulkEditDefaultForEventsModal.tsx
@@ -27,6 +27,7 @@ export function BulkEditDefaultForEventsModal(props: {
   });
 
   const eventTypesSelected = form.watch("eventTypeIds");
+  const isButtonDisabled = eventTypesSelected.length === 0;
 
   if (isFetching || !open || !data?.eventTypes) return null;
 
@@ -79,7 +80,7 @@ export function BulkEditDefaultForEventsModal(props: {
                 utils.viewer.getUsersDefaultConferencingApp.invalidate();
               }}
             />
-            <Button type="submit" color="primary" loading={props.isPending}>
+            <Button type="submit" color="primary" loading={props.isPending} disabled={isButtonDisabled}>
               {t("update")}
             </Button>
           </DialogFooter>