diff --git a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts index 0da7eadf87..6669cada2a 100644 --- a/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts +++ b/packages/platform/atoms/event-types/hooks/useEventTypeForm.ts @@ -332,8 +332,9 @@ export const useEventTypeForm = ({ } = dirtyValues; if (length && !Number(length)) throw new Error(t("event_setup_length_error")); - const finalSeatsPerTimeSlot = seatsPerTimeSlot ?? values.seatsPerTimeSlot; - const finalRecurringEvent = recurringEvent ?? values.recurringEvent; + const finalSeatsPerTimeSlot = + seatsPerTimeSlot === undefined ? eventType.seatsPerTimeSlot : seatsPerTimeSlot; + const finalRecurringEvent = recurringEvent === undefined ? eventType.recurringEvent : recurringEvent; if (finalSeatsPerTimeSlot && finalRecurringEvent) { throw new Error(t("recurring_event_seats_error")); diff --git a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts index 7d098bddbe..ebf03e1f14 100644 --- a/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts +++ b/packages/trpc/server/routers/viewer/eventTypes/update.handler.ts @@ -195,8 +195,9 @@ export const updateHandler = async ({ ctx, input }: UpdateOptions) => { throw new TRPCError({ code: "UNAUTHORIZED" }); } - const finalSeatsPerTimeSlot = seatsPerTimeSlot ?? eventType.seatsPerTimeSlot; - const finalRecurringEvent = recurringEvent ?? eventType.recurringEvent; + const finalSeatsPerTimeSlot = + seatsPerTimeSlot === undefined ? eventType.seatsPerTimeSlot : seatsPerTimeSlot; + const finalRecurringEvent = recurringEvent === undefined ? eventType.recurringEvent : recurringEvent; if (finalSeatsPerTimeSlot && finalRecurringEvent) { throw new TRPCError({