diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx
index c117d7108b6608..d261c29d817253 100644
--- a/packages/features/bookings/Booker/Booker.tsx
+++ b/packages/features/bookings/Booker/Booker.tsx
@@ -13,7 +13,7 @@ import TurnstileCaptcha from "@calcom/features/auth/Turnstile";
 import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
 import useSkipConfirmStep from "@calcom/features/bookings/Booker/components/hooks/useSkipConfirmStep";
 import { getQueryParam } from "@calcom/features/bookings/Booker/utils/query-param";
-import { useNonEmptyScheduleDays } from "@calcom/features/schedules/lib/use-schedule/useNonEmptyScheduleDays";
+import { useNonEmptyScheduleDays } from "@calcom/features/schedules/hooks/useNonEmptyScheduleDays";
 import { scrollIntoViewSmooth } from "@calcom/lib/browser/browser.utils";
 import { PUBLIC_INVALIDATE_AVAILABLE_SLOTS_ON_BOOKING_FORM } from "@calcom/lib/constants";
 import { CLOUDFLARE_SITE_ID, CLOUDFLARE_USE_TURNSTILE_IN_BOOKER } from "@calcom/lib/constants";
diff --git a/packages/features/bookings/Booker/components/AvailableTimeSlots.tsx b/packages/features/bookings/Booker/components/AvailableTimeSlots.tsx
index 2fccf7e04f7a23..945d34d21c9c0d 100644
--- a/packages/features/bookings/Booker/components/AvailableTimeSlots.tsx
+++ b/packages/features/bookings/Booker/components/AvailableTimeSlots.tsx
@@ -5,22 +5,22 @@ import { AvailableTimes, AvailableTimesSkeleton } from "@calcom/features/booking
 import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
 import type { IUseBookingLoadingStates } from "@calcom/features/bookings/Booker/components/hooks/useBookings";
 import type { BookerEvent } from "@calcom/features/bookings/types";
+import { useNonEmptyScheduleDays } from "@calcom/features/schedules/hooks/useNonEmptyScheduleDays";
+import { useSlotsForAvailableDates } from "@calcom/features/schedules/hooks/useSlotsForDate";
 import type { Slot } from "@calcom/features/schedules/lib/use-schedule/types";
-import { useNonEmptyScheduleDays } from "@calcom/features/schedules/lib/use-schedule/useNonEmptyScheduleDays";
-import { useSlotsForAvailableDates } from "@calcom/features/schedules/lib/use-schedule/useSlotsForDate";
 import { PUBLIC_INVALIDATE_AVAILABLE_SLOTS_ON_BOOKING_FORM } from "@calcom/lib/constants";
 import { localStorage } from "@calcom/lib/webstorage";
 import { BookerLayouts } from "@calcom/prisma/zod-utils";
 import classNames from "@calcom/ui/classNames";
 
 import { AvailableTimesHeader } from "../../components/AvailableTimesHeader";
-import type { useScheduleForEventReturnType } from "../utils/event";
+import type { UseScheduleForEventReturnType } from "../hooks/useScheduleForEvent";
 import { getQueryParam } from "../utils/query-param";
 
 type AvailableTimeSlotsProps = {
   extraDays?: number;
   limitHeight?: boolean;
-  schedule?: useScheduleForEventReturnType;
+  schedule?: UseScheduleForEventReturnType;
   isLoading: boolean;
   seatsPerTimeSlot?: number | null;
   showAvailableSeatsCount?: boolean | null;
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
index 2e4ae64ee19c64..6a4ba5bb3b05c5 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
@@ -10,8 +10,8 @@ import { Badge } from "@calcom/ui/components/badge";
 import { DialogContent } from "@calcom/ui/components/dialog";
 
 import { getDurationFormatted } from "../../../components/event-meta/Duration";
+import { useEvent } from "../../hooks/useEvent";
 import { FromTime } from "../../utils/dates";
-import { useEvent } from "../../utils/event";
 import { useBookerTime } from "../hooks/useBookerTime";
 
 const BookEventFormWrapper = ({ children, onCancel }: { onCancel: () => void; children: ReactNode }) => {
diff --git a/packages/features/bookings/Booker/components/DatePicker.tsx b/packages/features/bookings/Booker/components/DatePicker.tsx
index e4025bc44a06fd..e56bc4d0f157ca 100644
--- a/packages/features/bookings/Booker/components/DatePicker.tsx
+++ b/packages/features/bookings/Booker/components/DatePicker.tsx
@@ -5,7 +5,7 @@ import dayjs from "@calcom/dayjs";
 import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
 import type { DatePickerClassNames } from "@calcom/features/bookings/Booker/types";
 import { DatePicker as DatePickerComponent } from "@calcom/features/calendars/DatePicker";
-import { useNonEmptyScheduleDays } from "@calcom/features/schedules/lib/use-schedule/useNonEmptyScheduleDays";
+import { useNonEmptyScheduleDays } from "@calcom/features/schedules/hooks/useNonEmptyScheduleDays";
 import { weekdayToWeekIndex } from "@calcom/lib/dayjs";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { User } from "@calcom/prisma/client";
@@ -88,7 +88,7 @@ export const DatePicker = ({
 
   const onMonthChange = (date: Dayjs) => {
     setMonth(date.format("YYYY-MM"));
-    setSelectedDate({ date: date.format("YYYY-MM-DD") });
+    setSelectedDate({ date: date.format("YYYY-MM-DD"), omitUpdatingParams: true });
     setDayCount(null); // Whenever the month is changed, we nullify getting X days
   };
 
diff --git a/packages/features/bookings/Booker/components/LargeCalendar.tsx b/packages/features/bookings/Booker/components/LargeCalendar.tsx
index 0151d399d2fb3d..d441cf9a777345 100644
--- a/packages/features/bookings/Booker/components/LargeCalendar.tsx
+++ b/packages/features/bookings/Booker/components/LargeCalendar.tsx
@@ -8,7 +8,7 @@ import type { CalendarEvent } from "@calcom/features/calendars/weeklyview/types/
 import type { CalendarAvailableTimeslots } from "@calcom/features/calendars/weeklyview/types/state";
 import { localStorage } from "@calcom/lib/webstorage";
 
-import type { useScheduleForEventReturnType } from "../utils/event";
+import type { UseScheduleForEventReturnType } from "../hooks/useScheduleForEvent";
 import { getQueryParam } from "../utils/query-param";
 import { useOverlayCalendarStore } from "./OverlayCalendar/store";
 
@@ -19,7 +19,7 @@ export const LargeCalendar = ({
   event,
 }: {
   extraDays: number;
-  schedule?: useScheduleForEventReturnType["data"];
+  schedule?: UseScheduleForEventReturnType["data"];
   isLoading: boolean;
   event: {
     data?: Pick<BookerEvent, "length"> | null;
diff --git a/packages/features/bookings/Booker/hooks/useEvent.ts b/packages/features/bookings/Booker/hooks/useEvent.ts
new file mode 100644
index 00000000000000..6b0580c0d84b4c
--- /dev/null
+++ b/packages/features/bookings/Booker/hooks/useEvent.ts
@@ -0,0 +1,42 @@
+import { shallow } from "zustand/shallow";
+
+import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
+import { trpc } from "@calcom/trpc/react";
+
+export type useEventReturnType = ReturnType<typeof useEvent>;
+
+/**
+ * Wrapper hook around the trpc query that fetches
+ * the event currently viewed in the booker. It will get
+ * the current event slug and username from the booker store.
+ *
+ * Using this hook means you only need to use one hook, instead
+ * of combining multiple conditional hooks.
+ */
+export const useEvent = (props?: { fromRedirectOfNonOrgLink?: boolean; disabled?: boolean }) => {
+  const [username, eventSlug, isTeamEvent, org] = useBookerStoreContext(
+    (state) => [state.username, state.eventSlug, state.isTeamEvent, state.org],
+    shallow
+  );
+
+  const event = trpc.viewer.public.event.useQuery(
+    {
+      username: username ?? "",
+      eventSlug: eventSlug ?? "",
+      isTeamEvent,
+      org: org ?? null,
+      fromRedirectOfNonOrgLink: props?.fromRedirectOfNonOrgLink,
+    },
+    {
+      refetchOnWindowFocus: false,
+      enabled: !props?.disabled && Boolean(username) && Boolean(eventSlug),
+    }
+  );
+
+  return {
+    data: event?.data,
+    isSuccess: event?.isSuccess,
+    isError: event?.isError,
+    isPending: event?.isPending,
+  };
+};
diff --git a/packages/features/bookings/Booker/utils/event.ts b/packages/features/bookings/Booker/hooks/useScheduleForEvent.ts
similarity index 58%
rename from packages/features/bookings/Booker/utils/event.ts
rename to packages/features/bookings/Booker/hooks/useScheduleForEvent.ts
index a289b1c04e7580..be48bfd210da9f 100644
--- a/packages/features/bookings/Booker/utils/event.ts
+++ b/packages/features/bookings/Booker/hooks/useScheduleForEvent.ts
@@ -1,50 +1,12 @@
 import { shallow } from "zustand/shallow";
 
 import { useBookerStoreContext } from "@calcom/features/bookings/Booker/BookerStoreProvider";
-import { useSchedule } from "@calcom/features/schedules/lib/use-schedule/useSchedule";
+import { useSchedule } from "@calcom/features/schedules/hooks/useSchedule";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
-import { trpc } from "@calcom/trpc/react";
 
 import { useBookerTime } from "../components/hooks/useBookerTime";
 
-export type useEventReturnType = ReturnType<typeof useEvent>;
-export type useScheduleForEventReturnType = ReturnType<typeof useScheduleForEvent>;
-
-/**
- * Wrapper hook around the trpc query that fetches
- * the event currently viewed in the booker. It will get
- * the current event slug and username from the booker store.
- *
- * Using this hook means you only need to use one hook, instead
- * of combining multiple conditional hooks.
- */
-export const useEvent = (props?: { fromRedirectOfNonOrgLink?: boolean; disabled?: boolean }) => {
-  const [username, eventSlug, isTeamEvent, org] = useBookerStoreContext(
-    (state) => [state.username, state.eventSlug, state.isTeamEvent, state.org],
-    shallow
-  );
-
-  const event = trpc.viewer.public.event.useQuery(
-    {
-      username: username ?? "",
-      eventSlug: eventSlug ?? "",
-      isTeamEvent,
-      org: org ?? null,
-      fromRedirectOfNonOrgLink: props?.fromRedirectOfNonOrgLink,
-    },
-    {
-      refetchOnWindowFocus: false,
-      enabled: !props?.disabled && Boolean(username) && Boolean(eventSlug),
-    }
-  );
-
-  return {
-    data: event?.data,
-    isSuccess: event?.isSuccess,
-    isError: event?.isError,
-    isPending: event?.isPending,
-  };
-};
+export type UseScheduleForEventReturnType = ReturnType<typeof useScheduleForEvent>;
 
 /**
  * Gets schedule for the current event and current month.
@@ -54,12 +16,8 @@ export const useEvent = (props?: { fromRedirectOfNonOrgLink?: boolean; disabled?
  * Using this hook means you only need to use one hook, instead
  * of combining multiple conditional hooks.
  *
- * The prefetchNextMonth argument can be used to prefetch two months at once,
- * useful when the user is viewing dates near the end of the month,
- * this way the multi day view will show data of both months.
  */
 export const useScheduleForEvent = ({
-  prefetchNextMonth,
   username,
   eventSlug,
   eventId,
@@ -73,7 +31,6 @@ export const useScheduleForEvent = ({
   isTeamEvent,
   useApiV2 = true,
 }: {
-  prefetchNextMonth?: boolean;
   username?: string | null;
   eventSlug?: string | null;
   eventId?: number | null;
@@ -103,7 +60,6 @@ export const useScheduleForEvent = ({
     eventId,
     timezone,
     selectedDate,
-    prefetchNextMonth,
     monthCount,
     dayCount,
     rescheduleUid,
diff --git a/packages/features/bookings/Booker/types.ts b/packages/features/bookings/Booker/types.ts
index 02fc4343626197..28e5ee69ff2a03 100644
--- a/packages/features/bookings/Booker/types.ts
+++ b/packages/features/bookings/Booker/types.ts
@@ -7,12 +7,12 @@ import type { UseCalendarsReturnType } from "@calcom/features/bookings/Booker/co
 import type { UseSlotsReturnType } from "@calcom/features/bookings/Booker/components/hooks/useSlots";
 import type { UseVerifyCodeReturnType } from "@calcom/features/bookings/Booker/components/hooks/useVerifyCode";
 import type { UseVerifyEmailReturnType } from "@calcom/features/bookings/Booker/components/hooks/useVerifyEmail";
-import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event";
 import type { BookerEventQuery } from "@calcom/features/bookings/types";
 import type { IntlSupportedTimeZones } from "@calcom/lib/timeZones";
 import type { BookerLayouts } from "@calcom/prisma/zod-utils";
 
 import type { GetBookingType } from "../lib/get-booking";
+import type { UseScheduleForEventReturnType } from "./hooks/useScheduleForEvent";
 
 export type Timezone = (typeof IntlSupportedTimeZones)[number];
 
@@ -127,7 +127,7 @@ export type WrappedBookerPropsMain = {
   calendars: UseCalendarsReturnType;
   bookerForm: UseBookingFormReturnType;
   event: BookerEventQuery;
-  schedule: useScheduleForEventReturnType;
+  schedule: UseScheduleForEventReturnType;
   bookerLayout: UseBookerLayoutType;
   verifyEmail: UseVerifyEmailReturnType;
   customClassNames?: CustomClassNames;
diff --git a/packages/features/calendars/DatePicker.tsx b/packages/features/calendars/DatePicker.tsx
index 4936c2c2f5a0fe..93c494ef20828a 100644
--- a/packages/features/calendars/DatePicker.tsx
+++ b/packages/features/calendars/DatePicker.tsx
@@ -70,8 +70,6 @@ const Day = ({
   away,
   emoji,
   customClassName,
-  showMonthTooltip,
-  isFirstDayOfNextMonth,
   ...props
 }: JSX.IntrinsicElements["button"] & {
   active: boolean;
@@ -82,12 +80,11 @@ const Day = ({
     dayContainer?: string;
     dayActive?: string;
   };
-  showMonthTooltip?: boolean;
-  isFirstDayOfNextMonth?: boolean;
 }) => {
   const { t } = useLocale();
   const enabledDateButtonEmbedStyles = useEmbedStyles("enabledDateButton");
   const disabledDateButtonEmbedStyles = useEmbedStyles("disabledDateButton");
+  const [month] = useBookerStoreContext((state) => [state.month], shallow);
 
   const buttonContent = (
     <button
@@ -123,15 +120,16 @@ const Day = ({
     </button>
   );
 
-  const content = showMonthTooltip ? (
-    <Tooltip content={date.format("MMMM")}>{buttonContent}</Tooltip>
-  ) : (
-    buttonContent
-  );
+  const content =
+    !disabled && month !== date.format("YYYY-MM") ? (
+      <Tooltip content={date.format("MMMM")}>{buttonContent}</Tooltip>
+    ) : (
+      buttonContent
+    );
 
   return (
     <>
-      {isFirstDayOfNextMonth && (
+      {month !== date.format("YYYY-MM") && date.date() === 1 && (
         <div
           className={classNames(
             "absolute top-0 z-10 mx-auto w-fit rounded-full font-semibold uppercase tracking-wide",
@@ -198,7 +196,6 @@ const Days = ({
   const totalDays = daysInMonth(browsingDate);
 
   const showNextMonthDays = isSecondWeekOver && !isCompact;
-
   // Only apply end-of-month logic for main monthly view (not compact sidebar)
   if (showNextMonthDays) {
     const startDay = 8;
@@ -262,7 +259,6 @@ const Days = ({
     const oooInfo = daySlots.find((slot) => slot.away) || null;
 
     const isNextMonth = day.month() !== browsingDate.month();
-    const isFirstDayOfNextMonth = isSecondWeekOver && !isCompact && isNextMonth && day.date() === 1;
 
     const included = includedDates?.includes(dateKey);
     const excluded = excludedDates.includes(dateKey);
@@ -272,27 +268,25 @@ const Days = ({
     const away = isOOOAllDay;
 
     const disabled = away ? !oooInfo?.toUser : isNextMonth ? !hasAvailableSlots : !included || excluded;
-
     return {
       day,
       disabled,
       away,
       emoji: oooInfo?.emoji,
-      isFirstDayOfNextMonth,
     };
   });
 
+  const hasDatesLoaded = Boolean(daysToRenderForTheMonth.find((day) => !day.disabled));
+
   /**
    * Takes care of selecting a valid date in the month if the selected date is not available in the month
    */
-
   const useHandleInitialDateSelection = () => {
     // Let's not do something for now in case of multiple selected dates as behaviour is unclear and it's not needed at the moment
-    if (selected instanceof Array) {
+    if (!hasDatesLoaded || selected instanceof Array) {
       return;
     }
     const firstAvailableDateOfTheMonth = daysToRenderForTheMonth.find((day) => !day.disabled)?.day;
-
     const isSelectedDateAvailable = selected
       ? daysToRenderForTheMonth.some(({ day, disabled }) => {
           if (day && yyyymmdd(day) === yyyymmdd(selected) && !disabled) return true;
@@ -303,20 +297,16 @@ const Days = ({
       // If selected date not available in the month, select the first available date of the month
       const shouldOmitUpdatingParams = selected?.isValid() ? false : true; // In case a date is selected and it is not available, then we have to change search params
       props.onChange(firstAvailableDateOfTheMonth, shouldOmitUpdatingParams);
-    }
-    if (isSelectedDateAvailable) {
+    } else if (isSelectedDateAvailable) {
       props.onChange(dayjs(selected), true);
     }
-    if (!firstAvailableDateOfTheMonth) {
-      props.onChange(null);
-    }
   };
 
-  useEffect(useHandleInitialDateSelection);
+  useEffect(useHandleInitialDateSelection, [hasDatesLoaded, month]);
 
   return (
     <>
-      {daysToRenderForTheMonth.map(({ day, disabled, away, emoji, isFirstDayOfNextMonth }, idx) => (
+      {daysToRenderForTheMonth.map(({ day, disabled, away, emoji }, idx) => (
         <div key={day === null ? `e-${idx}` : `day-${day.format()}`} className="relative w-full pt-[100%]">
           {day === null ? (
             <div key={`e-${idx}`} />
@@ -342,8 +332,6 @@ const Days = ({
               active={isActive(day)}
               away={away}
               emoji={emoji}
-              showMonthTooltip={showNextMonthDays && !disabled && day.month() !== browsingDate.month()}
-              isFirstDayOfNextMonth={isFirstDayOfNextMonth}
             />
           )}
         </div>
@@ -407,6 +395,7 @@ const DatePicker = ({
       onMonthChange(browsingDate.add(newMonth, "month"));
     }
   };
+
   const month = browsingDate
     ? new Intl.DateTimeFormat(i18n.language, { month: "long" }).format(
         new Date(browsingDate.year(), browsingDate.month())
diff --git a/packages/features/embed/Embed.tsx b/packages/features/embed/Embed.tsx
index 3bc39082461860..d5db549a2fa471 100644
--- a/packages/features/embed/Embed.tsx
+++ b/packages/features/embed/Embed.tsx
@@ -16,14 +16,15 @@ import {
   useInitializeBookerStoreContext,
   useBookerStoreContext,
 } from "@calcom/features/bookings/Booker/BookerStoreProvider";
+import { useEvent } from "@calcom/features/bookings/Booker/hooks/useEvent";
+import { useScheduleForEvent } from "@calcom/features/bookings/Booker/hooks/useScheduleForEvent";
 import { useInitializeBookerStore } from "@calcom/features/bookings/Booker/store";
-import { useEvent, useScheduleForEvent } from "@calcom/features/bookings/Booker/utils/event";
 import DatePicker from "@calcom/features/calendars/DatePicker";
 import { Dialog } from "@calcom/features/components/controlled-dialog";
 import { TimezoneSelect } from "@calcom/features/components/timezone-select";
+import { useNonEmptyScheduleDays } from "@calcom/features/schedules/hooks/useNonEmptyScheduleDays";
+import { useSlotsForDate } from "@calcom/features/schedules/hooks/useSlotsForDate";
 import type { Slot } from "@calcom/features/schedules/lib/use-schedule/types";
-import { useNonEmptyScheduleDays } from "@calcom/features/schedules/lib/use-schedule/useNonEmptyScheduleDays";
-import { useSlotsForDate } from "@calcom/features/schedules/lib/use-schedule/useSlotsForDate";
 import { APP_NAME, DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants";
 import { weekdayToWeekIndex } from "@calcom/lib/dayjs";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
diff --git a/packages/features/schedules/lib/use-schedule/useApiV2AvailableSlots.ts b/packages/features/schedules/hooks/useApiV2AvailableSlots.ts
similarity index 100%
rename from packages/features/schedules/lib/use-schedule/useApiV2AvailableSlots.ts
rename to packages/features/schedules/hooks/useApiV2AvailableSlots.ts
diff --git a/packages/features/schedules/lib/use-schedule/useNonEmptyScheduleDays.ts b/packages/features/schedules/hooks/useNonEmptyScheduleDays.ts
similarity index 90%
rename from packages/features/schedules/lib/use-schedule/useNonEmptyScheduleDays.ts
rename to packages/features/schedules/hooks/useNonEmptyScheduleDays.ts
index c256946c96a14a..920c4171a0b4b0 100644
--- a/packages/features/schedules/lib/use-schedule/useNonEmptyScheduleDays.ts
+++ b/packages/features/schedules/hooks/useNonEmptyScheduleDays.ts
@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 
-import type { Slots } from "../use-schedule/types";
+import type { Slots } from "../lib/use-schedule/types";
 
 export const getNonEmptyScheduleDays = (slots?: Slots) => {
   if (typeof slots === "undefined") return [];
diff --git a/packages/features/schedules/lib/use-schedule/useSchedule.ts b/packages/features/schedules/hooks/useSchedule.ts
similarity index 94%
rename from packages/features/schedules/lib/use-schedule/useSchedule.ts
rename to packages/features/schedules/hooks/useSchedule.ts
index 11263327fd4add..eb2aabc2fbb7f0 100644
--- a/packages/features/schedules/lib/use-schedule/useSchedule.ts
+++ b/packages/features/schedules/hooks/useSchedule.ts
@@ -3,7 +3,7 @@ import { useSearchParams } from "next/navigation";
 import { updateEmbedBookerState } from "@calcom/embed-core/src/embed-iframe";
 import { useBookerStore } from "@calcom/features/bookings/Booker/store";
 import { isBookingDryRun } from "@calcom/features/bookings/Booker/utils/isBookingDryRun";
-import { useTimesForSchedule } from "@calcom/features/schedules/lib/use-schedule/useTimesForSchedule";
+import { getTimesForSchedule } from "@calcom/features/schedules/lib/use-schedule/getTimesForSchedule";
 import { getRoutedTeamMemberIdsFromSearchParams } from "@calcom/lib/bookings/getRoutedTeamMemberIdsFromSearchParams";
 import { PUBLIC_QUERY_AVAILABLE_SLOTS_INTERVAL_SECONDS } from "@calcom/lib/constants";
 import { getUsernameList } from "@calcom/lib/defaultEvents";
@@ -18,9 +18,8 @@ export type UseScheduleWithCacheArgs = {
   month?: string | null;
   timezone?: string | null;
   selectedDate?: string | null;
-  prefetchNextMonth?: boolean;
   duration?: number | null;
-  monthCount?: number | null;
+  monthCount?: number;
   dayCount?: number | null;
   rescheduleUid?: string | null;
   isTeamEvent?: boolean;
@@ -37,9 +36,8 @@ export const useSchedule = ({
   eventSlug,
   eventId,
   selectedDate,
-  prefetchNextMonth,
   duration,
-  monthCount,
+  monthCount = 1,
   dayCount,
   rescheduleUid,
   isTeamEvent,
@@ -50,13 +48,13 @@ export const useSchedule = ({
 }: UseScheduleWithCacheArgs) => {
   const bookerState = useBookerStore((state) => state.state);
 
-  const [startTime, endTime] = useTimesForSchedule({
+  const [startTime, endTime] = getTimesForSchedule({
     month,
     monthCount,
     dayCount,
-    prefetchNextMonth,
     selectedDate,
   });
+
   const searchParams = useSearchParams();
   const routedTeamMemberIds = searchParams
     ? getRoutedTeamMemberIdsFromSearchParams(new URLSearchParams(searchParams.toString()))
@@ -85,7 +83,6 @@ export const useSchedule = ({
     // @TODO: Old code fetched 2 days ago if we were fetching the current month.
     // Do we want / need to keep that behavior?
     startTime,
-    // if `prefetchNextMonth` is true, two months are fetched at once.
     endTime,
     timeZone: timezone!,
     duration: duration ? `${duration}` : undefined,
diff --git a/packages/features/schedules/lib/use-schedule/useSlotsForDate.ts b/packages/features/schedules/hooks/useSlotsForDate.ts
similarity index 95%
rename from packages/features/schedules/lib/use-schedule/useSlotsForDate.ts
rename to packages/features/schedules/hooks/useSlotsForDate.ts
index ff22adb3cd540b..43ae305eacc882 100644
--- a/packages/features/schedules/lib/use-schedule/useSlotsForDate.ts
+++ b/packages/features/schedules/hooks/useSlotsForDate.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
-import type { Slots, Slot } from "./types";
+import type { Slots, Slot } from "../lib/use-schedule/types";
 
 /**
  * Gets slots for a specific date from the schedule cache.
diff --git a/packages/features/schedules/lib/use-schedule/getTimesForSchedule.test.ts b/packages/features/schedules/lib/use-schedule/getTimesForSchedule.test.ts
new file mode 100644
index 00000000000000..bca2631c41c101
--- /dev/null
+++ b/packages/features/schedules/lib/use-schedule/getTimesForSchedule.test.ts
@@ -0,0 +1,128 @@
+import { expect, it, describe, vi, afterEach } from "vitest";
+
+import { getTimesForSchedule } from "./getTimesForSchedule";
+
+function toLocalIsoWithOffset(date: Date) {
+  const pad = (n: number) => String(n).padStart(2, "0");
+
+  const year = date.getFullYear();
+  const month = pad(date.getMonth() + 1);
+  const day = pad(date.getDate());
+  const hours = pad(date.getHours());
+  const minutes = pad(date.getMinutes());
+  const seconds = pad(date.getSeconds());
+
+  const offset = -date.getTimezoneOffset(); // in minutes
+  const sign = offset >= 0 ? "+" : "-";
+  const offsetHours = pad(Math.floor(Math.abs(offset) / 60));
+  const offsetMinutes = pad(Math.abs(offset) % 60);
+
+  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}${sign}${offsetHours}:${offsetMinutes}`;
+}
+
+describe("getTimesForSchedule", () => {
+  afterEach(() => {
+    // Reset the mocked time after each test
+    vi.useRealTimers();
+  });
+
+  it("starts at the current month", () => {
+    vi.setSystemTime(new Date("2025-08-23T00:00:00Z"));
+    {
+      const [startTime, endTime] = getTimesForSchedule({});
+      expect(toLocalIsoWithOffset(new Date(startTime)).startsWith("2025-08-01T00:00:00")).toBe(true);
+      expect(toLocalIsoWithOffset(new Date(endTime)).startsWith("2025-09-01T00:00:00")).toBe(true);
+    }
+  });
+
+  it("can select a full (next) month", () => {
+    {
+      const [startTime, endTime] = getTimesForSchedule({
+        month: "2025-10",
+      });
+
+      const expectedStartTime = toLocalIsoWithOffset(new Date(2025, 9));
+      const expectedEndTime = new Date(2025, 11);
+
+      expect(toLocalIsoWithOffset(new Date(startTime))).toBe(expectedStartTime);
+      // expect(toLocalIsoWithOffset(new Date(endTime))).toBe(expectedEndTime);
+    }
+  });
+
+  it("can select multiple months", () => {
+    {
+      // also tests DST changes because 2025-12 is post-DST
+      const [startTime, endTime] = getTimesForSchedule({
+        month: "2025-10",
+        monthCount: 2,
+      });
+
+      const expectedStartTime = toLocalIsoWithOffset(new Date(2025, 9));
+      const expectedEndTime = toLocalIsoWithOffset(new Date(2025, 11));
+
+      expect(toLocalIsoWithOffset(new Date(startTime))).toBe(expectedStartTime);
+      expect(toLocalIsoWithOffset(new Date(endTime))).toBe(expectedEndTime);
+    }
+  });
+
+  it("can select the next 7 days", () => {
+    vi.setSystemTime(new Date("2025-08-23T01:00:00+01:00"));
+    {
+      const [startTime, endTime] = getTimesForSchedule({
+        selectedDate: new Date().toISOString(),
+        dayCount: 7,
+      });
+      expect(startTime).toBe("2025-08-23T00:00:00.000Z");
+      expect(endTime).toBe("2025-08-30T00:00:00.000Z");
+    }
+    vi.setSystemTime(new Date("2025-08-01T00:00:00Z"));
+    console.log(new Date().toISOString());
+    {
+      const [startTime, endTime] = getTimesForSchedule({
+        selectedDate: new Date().toISOString(),
+        dayCount: 7,
+      });
+      expect(startTime).toBe("2025-08-01T00:00:00.000Z");
+      expect(endTime).toBe("2025-08-08T00:00:00.000Z");
+    }
+    vi.setSystemTime(new Date("2025-08-23T13:00:00+01:00"));
+    {
+      const [startTime, endTime] = getTimesForSchedule({
+        selectedDate: new Date().toISOString(),
+        dayCount: 7,
+      });
+      expect(startTime).toBe("2025-08-23T12:00:00.000Z");
+      expect(endTime).toBe("2025-08-30T12:00:00.000Z");
+    }
+  });
+
+  it("can select the next 7 days from now", () => {
+    // starts the day on 2025-08-23T00:00:00+01:00, 23:00 in UTC
+    vi.setSystemTime(new Date("2025-08-23T01:00:00+01:00"));
+    {
+      const [startTime, endTime] = getTimesForSchedule({
+        dayCount: 7,
+      });
+      expect(toLocalIsoWithOffset(new Date(startTime)).toString().startsWith("2025-08-23T00:00:00")).toBe(
+        true
+      );
+      expect(toLocalIsoWithOffset(new Date(endTime)).toString().startsWith("2025-08-30T00:00:00")).toBe(true);
+    }
+  });
+
+  it("can select the first 7 days of a month", () => {
+    vi.setSystemTime(new Date("2025-08-23T01:00:00+01:00"));
+    {
+      const [startTime, endTime] = getTimesForSchedule({
+        month: "2025-10",
+        dayCount: 7,
+      });
+
+      const expectedStartTime = toLocalIsoWithOffset(new Date(2025, 9));
+      const expectedEndTime = toLocalIsoWithOffset(new Date(2025, 9, 8));
+
+      expect(toLocalIsoWithOffset(new Date(startTime))).toBe(expectedStartTime);
+      expect(toLocalIsoWithOffset(new Date(endTime))).toBe(expectedEndTime);
+    }
+  });
+});
diff --git a/packages/features/schedules/lib/use-schedule/getTimesForSchedule.ts b/packages/features/schedules/lib/use-schedule/getTimesForSchedule.ts
new file mode 100644
index 00000000000000..66d05a1c335f70
--- /dev/null
+++ b/packages/features/schedules/lib/use-schedule/getTimesForSchedule.ts
@@ -0,0 +1,49 @@
+import { startOfMonth, startOfDay, addMonths, addDays } from "date-fns";
+
+type GetTimesForScheduleProps = {
+  month?: string | null;
+  selectedDate?: string | null;
+  monthCount?: number;
+  dayCount?: number | null;
+};
+
+const parseMonth = (monthString: string) => {
+  const [year, month] = monthString.split("-").map(Number);
+  return new Date(year, month - 1);
+};
+
+export const getTimesForSchedule = ({
+  month,
+  monthCount = 1,
+  selectedDate,
+  dayCount,
+}: GetTimesForScheduleProps): [string, string] => {
+  const now = new Date();
+  const browsingMonthStartDate = month ? parseMonth(month) : startOfMonth(now);
+  const browsingMonthEndDate = addMonths(browsingMonthStartDate, monthCount);
+
+  if (!dayCount || dayCount <= 0) {
+    return [browsingMonthStartDate.toISOString(), browsingMonthEndDate.toISOString()];
+  }
+  // Why the non-null assertions? All of these arguments are checked in the enabled condition,
+  // and the query will not run if they are null. However, the check in `enabled` does
+  // no satisfy typescript.
+  let startTime;
+  let endTime;
+
+  if (selectedDate) {
+    startTime = new Date(selectedDate);
+    endTime = addDays(startTime, dayCount);
+  } else if (
+    browsingMonthStartDate.getFullYear() === now.getFullYear() &&
+    browsingMonthStartDate.getMonth() === now.getMonth()
+  ) {
+    startTime = startOfDay(now);
+    endTime = addDays(startTime, dayCount);
+  } else {
+    startTime = browsingMonthStartDate;
+    endTime = addDays(browsingMonthStartDate, dayCount);
+  }
+
+  return [startTime.toISOString(), endTime.toISOString()];
+};
diff --git a/packages/features/schedules/lib/use-schedule/useTimesForSchedule.ts b/packages/features/schedules/lib/use-schedule/useTimesForSchedule.ts
deleted file mode 100644
index eeb62d6d8ed6ee..00000000000000
--- a/packages/features/schedules/lib/use-schedule/useTimesForSchedule.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import dayjs from "@calcom/dayjs";
-
-import type { UseScheduleWithCacheArgs } from "./useSchedule";
-
-type UseTimesForScheduleProps = Pick<
-  UseScheduleWithCacheArgs,
-  "month" | "monthCount" | "dayCount" | "selectedDate" | "prefetchNextMonth"
->;
-export const useTimesForSchedule = ({
-  month,
-  monthCount,
-  selectedDate,
-  dayCount,
-  prefetchNextMonth,
-}: UseTimesForScheduleProps): [string, string] => {
-  const now = dayjs();
-  const monthDayjs = month ? dayjs(month) : now;
-  const nextMonthDayjs = monthDayjs.add(monthCount ? monthCount : 1, "month");
-  // Why the non-null assertions? All of these arguments are checked in the enabled condition,
-  // and the query will not run if they are null. However, the check in `enabled` does
-  // no satisfy typescript.
-  let startTime;
-  let endTime;
-
-  if (!!dayCount && dayCount > 0) {
-    if (selectedDate) {
-      startTime = dayjs(selectedDate).toISOString();
-      endTime = dayjs(selectedDate).add(dayCount, "day").toISOString();
-    } else if (monthDayjs.month() === now.month()) {
-      startTime = now.startOf("day").toISOString();
-      endTime = now.startOf("day").add(dayCount, "day").toISOString();
-    } else {
-      startTime = monthDayjs.startOf("month").toISOString();
-      endTime = monthDayjs.startOf("month").add(dayCount, "day").toISOString();
-    }
-  } else {
-    startTime = monthDayjs.startOf("month").toISOString();
-    endTime = (prefetchNextMonth ? nextMonthDayjs : monthDayjs).endOf("month").toISOString();
-  }
-  return [startTime, endTime];
-};
diff --git a/packages/features/troubleshooter/components/LargeCalendar.tsx b/packages/features/troubleshooter/components/LargeCalendar.tsx
index b4d30ee5714f49..3036a043f17c63 100644
--- a/packages/features/troubleshooter/components/LargeCalendar.tsx
+++ b/packages/features/troubleshooter/components/LargeCalendar.tsx
@@ -2,13 +2,13 @@ import { useSession } from "next-auth/react";
 import { useMemo } from "react";
 
 import dayjs from "@calcom/dayjs";
+import { useTimePreferences } from "@calcom/features/bookings/lib/timePreferences";
 import { Calendar } from "@calcom/features/calendars/weeklyview";
 import type { CalendarAvailableTimeslots } from "@calcom/features/calendars/weeklyview/types/state";
+import { useSchedule } from "@calcom/features/schedules/hooks/useSchedule";
 import { BookingStatus } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc";
 
-import { useTimePreferences } from "../../bookings/lib/timePreferences";
-import { useSchedule } from "../../schedules/lib/use-schedule/useSchedule";
 import { useTroubleshooterStore } from "../store";
 
 export const LargeCalendar = ({ extraDays }: { extraDays: number }) => {
diff --git a/packages/platform/atoms/booker/BookerPlatformWrapper.tsx b/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
index 16522116bf1009..a05d2c5c5645c2 100644
--- a/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
+++ b/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
@@ -17,7 +17,7 @@ import { useBookingForm } from "@calcom/features/bookings/Booker/components/hook
 import { useLocalSet } from "@calcom/features/bookings/Booker/components/hooks/useLocalSet";
 import { useInitializeBookerStore } from "@calcom/features/bookings/Booker/store";
 import { useTimePreferences } from "@calcom/features/bookings/lib";
-import { useTimesForSchedule } from "@calcom/features/schedules/lib/use-schedule/useTimesForSchedule";
+import { getTimesForSchedule } from "@calcom/features/schedules/lib/use-schedule/getTimesForSchedule";
 import { getRoutedTeamMemberIdsFromSearchParams } from "@calcom/lib/bookings/getRoutedTeamMemberIdsFromSearchParams";
 import { getUsernameList } from "@calcom/lib/defaultEvents";
 import type { ConnectedDestinationCalendars } from "@calcom/lib/getConnectedDestinationCalendars";
@@ -241,19 +241,20 @@ const BookerPlatformWrapperComponent = (
       dayjs().isAfter(dayjs(month).startOf("month").add(2, "week")));
 
   const monthCount =
-    ((bookerLayout.layout !== BookerLayouts.WEEK_VIEW && bookerState === "selecting_time") ||
-      bookerLayout.layout === BookerLayouts.COLUMN_VIEW) &&
+    bookerLayout.layout === BookerLayouts.MONTH_VIEW &&
     dayjs(date).add(1, "month").month() !==
       dayjs(date).add(bookerLayout.columnViewExtraDays.current, "day").month()
-      ? 2
+      ? prefetchNextMonth
+        ? 2
+        : 1
       : undefined;
+
   const { timezone } = useTimePreferences();
 
-  const [calculatedStartTime, calculatedEndTime] = useTimesForSchedule({
+  const [calculatedStartTime, calculatedEndTime] = getTimesForSchedule({
     month,
     monthCount,
     dayCount,
-    prefetchNextMonth,
     selectedDate,
   });
 
diff --git a/packages/platform/atoms/booker/BookerWebWrapper.tsx b/packages/platform/atoms/booker/BookerWebWrapper.tsx
index 19607722f77ae6..17392f2f50c3c6 100644
--- a/packages/platform/atoms/booker/BookerWebWrapper.tsx
+++ b/packages/platform/atoms/booker/BookerWebWrapper.tsx
@@ -24,8 +24,9 @@ import { useCalendars } from "@calcom/features/bookings/Booker/components/hooks/
 import { useSlots } from "@calcom/features/bookings/Booker/components/hooks/useSlots";
 import { useVerifyCode } from "@calcom/features/bookings/Booker/components/hooks/useVerifyCode";
 import { useVerifyEmail } from "@calcom/features/bookings/Booker/components/hooks/useVerifyEmail";
+import { useEvent } from "@calcom/features/bookings/Booker/hooks/useEvent";
+import { useScheduleForEvent } from "@calcom/features/bookings/Booker/hooks/useScheduleForEvent";
 import { useInitializeBookerStore } from "@calcom/features/bookings/Booker/store";
-import { useEvent, useScheduleForEvent } from "@calcom/features/bookings/Booker/utils/event";
 import { useBrandColors } from "@calcom/features/bookings/Booker/utils/use-brand-colors";
 import type { getPublicEvent } from "@calcom/features/eventtypes/lib/getPublicEvent";
 import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR, WEBAPP_URL } from "@calcom/lib/constants";
@@ -64,7 +65,7 @@ const BookerPlatformWrapperComponent = (props: BookerWebWrapperAtomProps) => {
     typeof window !== "undefined" ? new URLSearchParams(window.location.search).get("rescheduledBy") : null;
   const bookingUid =
     typeof window !== "undefined" ? new URLSearchParams(window.location.search).get("bookingUid") : null;
-  const date = dayjs(selectedDate).format("YYYY-MM-DD");
+
   const timezone = searchParams?.get("cal.tz") || null;
 
   useEffect(() => {
@@ -96,6 +97,8 @@ const BookerPlatformWrapperComponent = (props: BookerWebWrapperAtomProps) => {
   const [dayCount] = useBookerStoreContext((state) => [state.dayCount, state.setDayCount], shallow);
   const [month] = useBookerStoreContext((state) => [state.month, state.setMonth], shallow);
 
+  const date = dayjs(selectedDate).format("YYYY-MM-DD");
+
   const { data: session } = useSession();
   const routerQuery = useRouterQuery();
   const hasSession = !!session;
@@ -150,18 +153,18 @@ const BookerPlatformWrapperComponent = (props: BookerWebWrapperAtomProps) => {
       dayjs().isAfter(dayjs(month).startOf("month").add(2, "week")));
 
   const monthCount =
-    ((bookerLayout.layout !== BookerLayouts.WEEK_VIEW && bookerState === "selecting_time") ||
-      bookerLayout.layout === BookerLayouts.COLUMN_VIEW) &&
+    bookerLayout.layout === BookerLayouts.MONTH_VIEW &&
     dayjs(date).add(1, "month").month() !==
       dayjs(date).add(bookerLayout.columnViewExtraDays.current, "day").month()
-      ? 2
+      ? prefetchNextMonth
+        ? 2
+        : 1
       : undefined;
   /**
    * Prioritize dateSchedule load
    * Component will render but use data already fetched from here, and no duplicate requests will be made
    * */
   const schedule = useScheduleForEvent({
-    prefetchNextMonth,
     eventId: props.entity.eventTypeId ?? event.data?.id,
     username: props.username,
     monthCount,
diff --git a/turbo.json b/turbo.json
index cdc4e1a6c948c9..460d3676781b93 100644
--- a/turbo.json
+++ b/turbo.json
@@ -228,6 +228,7 @@
     "NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED",
     "NEXT_PUBLIC_API_V2_ROOT_URL",
     "NEXT_PUBLIC_VAPID_PUBLIC_KEY",
+    "NEXT_PUBLIC_IS_E2E",
     "VAPID_PRIVATE_KEY",
     "CAL_VIDEO_BUCKET_NAME",
     "CAL_VIDEO_BUCKET_REGION",