diff --git a/packages/lib/event-types/getEventTypeById.ts b/packages/lib/event-types/getEventTypeById.ts index cc661b058e..738934cd07 100644 --- a/packages/lib/event-types/getEventTypeById.ts +++ b/packages/lib/event-types/getEventTypeById.ts @@ -103,7 +103,10 @@ export const getEventTypeById = async ({ const eventType = { ...restEventType, - schedule: rawEventType.schedule?.id || rawEventType.users[0]?.defaultScheduleId || null, + schedule: + rawEventType.schedule?.id || + (!rawEventType.team ? rawEventType.users[0]?.defaultScheduleId : null) || + null, instantMeetingSchedule: rawEventType.instantMeetingSchedule?.id || null, scheduleName: rawEventType.schedule?.name || null, recurringEvent: parseRecurringEvent(restEventType.recurringEvent), diff --git a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabPlatformWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabPlatformWrapper.tsx index c43e85dd93..5584df2d80 100644 --- a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabPlatformWrapper.tsx +++ b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabPlatformWrapper.tsx @@ -27,7 +27,7 @@ const EventAvailabilityTabPlatformWrapper = ({ const scheduleId = formMethods.watch("schedule"); const { isLoading: isSchedulePending, data: scheduleQueryData } = useSchedule( - scheduleId || user?.defaultScheduleId || undefined + scheduleId || (!props.isTeamEvent ? user?.defaultScheduleId : undefined) || undefined ); const { data: schedulesQueryData, isLoading: isSchedulesPending } = useSchedules(); diff --git a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx index c63fff2ccd..11cddf2186 100644 --- a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx +++ b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx @@ -32,10 +32,11 @@ const EventAvailabilityTabWebWrapper = (props: EventAvailabilityTabWebWrapperPro const { isPending: isSchedulePending, data: scheduleQueryData } = trpc.viewer.availability.schedule.get.useQuery( { - scheduleId: scheduleId || props.user?.defaultScheduleId || undefined, + scheduleId: + scheduleId || (!props.isTeamEvent ? props.user?.defaultScheduleId : undefined) || undefined, isManagedEventType: isManagedEventType || isChildrenManagedEventType, }, - { enabled: !!scheduleId || !!props.user?.defaultScheduleId } + { enabled: !!scheduleId || (!props.isTeamEvent && !!props.user?.defaultScheduleId) } ); const { data: schedulesQueryData, isPending: isSchedulesPending } =