diff --git a/apps/web/modules/bookings/components/DatePicker.tsx b/apps/web/modules/bookings/components/DatePicker.tsx index 1c1a57efc39b87..ae0067879aa278 100644 --- a/apps/web/modules/bookings/components/DatePicker.tsx +++ b/apps/web/modules/bookings/components/DatePicker.tsx @@ -1,3 +1,4 @@ +import { useEffect, useRef } from "react"; import { shallow } from "zustand/shallow"; import type { Dayjs } from "@calcom/dayjs"; @@ -108,7 +109,15 @@ export const DatePicker = ({ onMonthChange, isLoading: isLoading ?? true, }); - moveToNextMonthOnNoAvailability(); + const hasInitialJumpOccurred = useRef(false); + + useEffect(() => { + // Only auto-jump on initial load when data is loaded + if (!isLoading && !hasInitialJumpOccurred.current) { + moveToNextMonthOnNoAvailability(); + hasInitialJumpOccurred.current = true; + } + }, [isLoading]); // Determine if this is a compact sidebar view based on layout const isCompact = layout !== "month_view" && layout !== "mobile";