diff --git a/apps/web/components/booking/BookingDescription.tsx b/apps/web/components/booking/BookingDescription.tsx
index 3033c11194..f94a8be087 100644
--- a/apps/web/components/booking/BookingDescription.tsx
+++ b/apps/web/components/booking/BookingDescription.tsx
@@ -4,11 +4,11 @@ import { FC, ReactNode, useEffect } from "react";
 import dayjs from "@calcom/dayjs";
 import { classNames } from "@calcom/lib";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
 import { Icon, Badge } from "@calcom/ui";
 
-import useRouterQuery from "@lib/hooks/useRouterQuery";
-
 import { UserAvatars } from "@components/booking/UserAvatars";
+import { bookingPageSchema } from "@components/booking/pages/BookingPage";
 import EventTypeDescriptionSafeHTML from "@components/eventtype/EventTypeDescriptionSafeHTML";
 
 import type { AvailabilityPageProps } from "../../pages/[user]/[type]";
@@ -42,18 +42,20 @@ interface Props {
 
 const BookingDescription: FC<Props> = (props) => {
   const { profile, eventType, isBookingPage = false, children } = props;
-  const { date: bookingDate } = useRouterQuery("date");
   const { t } = useLocale();
-  const { duration = eventType.length.toString(), setQuery: setDuration } = useRouterQuery("duration");
+  const {
+    data: { date: bookingDate, duration = eventType.length.toString() },
+    setQuery,
+  } = useTypedQuery(bookingPageSchema);
 
   useEffect(() => {
     if (
       eventType.metadata?.multipleDuration &&
       !eventType.metadata?.multipleDuration?.includes(Number(duration))
     ) {
-      setDuration(eventType.length.toString());
+      setQuery("duration", eventType.length);
     }
-  }, [duration, setDuration, eventType.length, eventType.metadata?.multipleDuration]);
+  }, [duration, setQuery, eventType.length, eventType.metadata?.multipleDuration]);
 
   let requiresConfirmation = eventType?.requiresConfirmation;
   let requiresConfirmationText = t("requires_confirmation");
@@ -140,13 +142,13 @@ const BookingDescription: FC<Props> = (props) => {
                       variant="gray"
                       size="lg"
                       className={classNames(
-                        duration === dur.toString()
+                        duration === dur
                           ? "bg-darkgray-200 text-darkgray-900 dark:bg-darkmodebrand dark:!text-darkmodebrandcontrast"
                           : "hover:bg-darkgray-200 dark:hover:bg-darkmodebrand hover:text-darkgray-900 dark:hover:text-darkmodebrandcontrast dark:bg-darkgray-200 bg-gray-200 text-gray-900 dark:text-white",
                         "cursor-pointer"
                       )}
                       onClick={() => {
-                        setDuration(dur);
+                        setQuery("duration", dur);
                       }}>
                       {dur} {t("minute_timeUnit")}
                     </Badge>
diff --git a/apps/web/components/booking/pages/BookingPage.tsx b/apps/web/components/booking/pages/BookingPage.tsx
index a8f90b0f1b..69b587e23d 100644
--- a/apps/web/components/booking/pages/BookingPage.tsx
+++ b/apps/web/components/booking/pages/BookingPage.tsx
@@ -58,6 +58,17 @@ import { BookPageProps } from "../../../pages/[user]/book";
 import { HashLinkPageProps } from "../../../pages/d/[link]/book";
 import { TeamBookingPageProps } from "../../../pages/team/[slug]/book";
 
+export const bookingPageSchema = z.object({
+  user: z.string(),
+  type: z.string(),
+  duration: z
+    .string()
+    .regex(/^\d+$/)
+    .transform((id) => parseInt(id))
+    .optional(),
+  date: z.string().optional(),
+});
+
 type BookingPageProps = BookPageProps | TeamBookingPageProps | HashLinkPageProps;
 
 type BookingFormValues = {