diff --git a/apps/web/components/booking/AvailableTimes.tsx b/apps/web/components/booking/AvailableTimes.tsx
index e6b7e33054..3a78be01a9 100644
--- a/apps/web/components/booking/AvailableTimes.tsx
+++ b/apps/web/components/booking/AvailableTimes.tsx
@@ -105,7 +105,7 @@ const AvailableTimes: FC<AvailableTimesProps> = ({
                     {!!seatsPerTimeSlot && <p className={`text-sm`}>{t("booking_full")}</p>}
                   </div>
                 ) : (
-                  <Link href={bookingUrl}>
+                  <Link href={bookingUrl} prefetch={false}>
                     <a
                       className={classNames(
                         "text-primary-500 hover:bg-brand hover:text-brandcontrast dark:hover:bg-darkmodebrand dark:hover:text-darkmodebrandcontrast mb-2 block rounded-sm border bg-white py-4 font-medium hover:text-white dark:border-transparent dark:bg-gray-600 dark:text-neutral-200 dark:hover:border-black",
diff --git a/apps/web/components/booking/pages/AvailabilityPage.tsx b/apps/web/components/booking/pages/AvailabilityPage.tsx
index 841e4480f9..957e10a7fd 100644
--- a/apps/web/components/booking/pages/AvailabilityPage.tsx
+++ b/apps/web/components/booking/pages/AvailabilityPage.tsx
@@ -40,7 +40,6 @@ import { getRecurringFreq } from "@calcom/lib/recurringStrings";
 import { localStorage } from "@calcom/lib/webstorage";
 import DatePicker from "@calcom/ui/booker/DatePicker";
 
-import { asStringOrUndefined } from "@lib/asStringOrNull";
 import { timeZone as localStorageTimeZone } from "@lib/clock";
 // import { timeZone } from "@lib/clock";
 import { useExposePlanGlobally } from "@lib/hooks/useExposePlanGlobally";
@@ -153,7 +152,6 @@ const useSlots = ({
 
 const SlotPicker = ({
   eventType,
-  timezoneDropdown,
   timeFormat,
   timeZone,
   recurringEventCount,
@@ -161,7 +159,6 @@ const SlotPicker = ({
   weekStart = 0,
 }: {
   eventType: Pick<EventType, "id" | "schedulingType" | "slug">;
-  timezoneDropdown: JSX.Element;
   timeFormat: string;
   timeZone: string;
   seatsPerTimeSlot?: number;
@@ -170,15 +167,12 @@ const SlotPicker = ({
 }) => {
   const [selectedDate, setSelectedDate] = useState<Dayjs>();
   const [browsingDate, setBrowsingDate] = useState<Dayjs>();
-
+  const { date, setQuery: setDate } = useRouterQuery("date");
+  const { month, setQuery: setMonth } = useRouterQuery("month");
   const router = useRouter();
 
   useEffect(() => {
-    if (!router.isReady) {
-      return;
-    }
-    const month = asStringOrUndefined(router.query.month);
-    const date = asStringOrUndefined(router.query.date);
+    if (!router.isReady) return;
 
     // Etc/GMT is not actually a timeZone, so handle this select option explicitly to prevent a hard crash.
     if (timeZone === "Etc/GMT") {
@@ -192,7 +186,7 @@ const SlotPicker = ({
         setSelectedDate(dayjs(date).tz(timeZone, true));
       }
     }
-  }, [router.isReady, router.query.month, router.query.date, timeZone]);
+  }, [router.isReady, month, date, timeZone]);
 
   const { i18n, isLocaleReady } = useLocale();
 
@@ -224,29 +218,11 @@ const SlotPicker = ({
         includedDates={Object.keys(slots).filter((k) => slots[k].length > 0)}
         locale={isLocaleReady ? i18n.language : "en"}
         selected={selectedDate}
-        onChange={(selectedDate) => {
-          router.replace(
-            {
-              query: {
-                ...router.query,
-                date: selectedDate.format("YYYY-MM-DD"),
-              },
-            },
-            undefined,
-            { shallow: true }
-          );
+        onChange={(newDate) => {
+          setDate(newDate.format("YYYY-MM-DD"));
         }}
-        onMonthChange={(browsingDate) => {
-          router.replace(
-            {
-              query: {
-                ...router.query,
-                month: browsingDate.format("YYYY-MM"),
-              },
-            },
-            undefined,
-            { shallow: true }
-          );
+        onMonthChange={(newMonth) => {
+          setMonth(newMonth.format("YYYY-MM"));
         }}
         browsingDate={browsingDate}
         weekStart={weekStart}
@@ -320,6 +296,19 @@ const dateQuerySchema = z.object({
   timeZone: z.string().optional().default(""),
 });
 
+const useRouterQuery = <T extends string>(name: T) => {
+  const router = useRouter();
+  const query = z.object({ [name]: z.string().optional() }).parse(router.query);
+
+  const setQuery = (newValue: string | number | null | undefined) => {
+    router.replace({ query: { ...router.query, [name]: newValue } }, undefined, { shallow: true });
+  };
+
+  return { [name]: query[name], setQuery } as {
+    [K in T]: string | undefined;
+  } & { setQuery: typeof setQuery };
+};
+
 const AvailabilityPage = ({ profile, eventType }: Props) => {
   const router = useRouter();
   const isEmbed = useIsEmbed();
@@ -705,7 +694,6 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                       : profile.weekStart /* Allows providing weekStart as number */
                   }
                   eventType={eventType}
-                  timezoneDropdown={timezoneDropdown}
                   timeFormat={timeFormat}
                   timeZone={timeZone}
                   seatsPerTimeSlot={eventType.seatsPerTimeSlot || undefined}