diff --git a/apps/web/pages/event-types/index.tsx b/apps/web/pages/event-types/index.tsx
index 2b0961b2c6..2c993e95e8 100644
--- a/apps/web/pages/event-types/index.tsx
+++ b/apps/web/pages/event-types/index.tsx
@@ -165,8 +165,8 @@ export const EventTypeList = ({ group, groupIndex, readOnly, types }: EventTypeL
     },
   });
   const { data } = trpc.viewer.availability.list.useQuery();
-  const availabilities = data?.schedules?.map((schedule) => schedule.availability) ?? [];
-  const emptyAvailability = availabilities.filter((availability) => availability.length > 0).length === 0;
+  const schedulesDefaultAvailability = data?.schedules?.find((schedule) => schedule.isDefault)?.availability;
+  const emptyDefaultAvailability = schedulesDefaultAvailability?.length === 0;
 
   const setHiddenMutation = trpc.viewer.eventTypes.update.useMutation({
     onMutate: async ({ id }) => {
@@ -354,7 +354,7 @@ export const EventTypeList = ({ group, groupIndex, readOnly, types }: EventTypeL
                             {t("hidden")}
                           </Badge>
                         )}
-                        {type.team === null && type.availability.length === 0 && emptyAvailability && (
+                        {type.team === null && type.schedule === null && emptyDefaultAvailability && (
                           <Badge variant="red" size="lg">
                             {t("empty_availability")}
                           </Badge>
diff --git a/packages/trpc/server/routers/viewer/eventTypes.tsx b/packages/trpc/server/routers/viewer/eventTypes.tsx
index 02d777508e..5d8d3e697c 100644
--- a/packages/trpc/server/routers/viewer/eventTypes.tsx
+++ b/packages/trpc/server/routers/viewer/eventTypes.tsx
@@ -202,9 +202,14 @@ export const eventTypesRouter = router({
           },
         },
       },
-      availability: {
+      schedule: {
         select: {
           id: true,
+          availability: {
+            select: {
+              id: true,
+            },
+          },
         },
       },
       ...baseEventTypeSelect,