diff --git a/apps/web/app/bookings/[status]/page.tsx b/apps/web/app/bookings/[status]/page.tsx
index 6e859d38ca..d7e7577ff6 100644
--- a/apps/web/app/bookings/[status]/page.tsx
+++ b/apps/web/app/bookings/[status]/page.tsx
@@ -1,6 +1,5 @@
 import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
 import { redirect } from "next/navigation";
 import { z } from "zod";
 
@@ -21,7 +20,7 @@ export const generateStaticParams = async () => {
   return validStatuses.map((status) => ({ status }));
 };
 
-const Page = async ({ params, searchParams }: PageProps) => {
+const Page = ({ params, searchParams }: PageProps) => {
   const parsed = querySchema.safeParse({ ...params, ...searchParams });
   if (!parsed.success) {
     redirect("/bookings/upcoming");
@@ -30,4 +29,4 @@ const Page = async ({ params, searchParams }: PageProps) => {
   return <BookingsList status={parsed.data.status} />;
 };
 
-export default WithLayout({ ServerPage: Page })<"P">;
+export default Page;
diff --git a/apps/web/app/bookings/layout.tsx b/apps/web/app/bookings/layout.tsx
new file mode 100644
index 0000000000..9f179fdea9
--- /dev/null
+++ b/apps/web/app/bookings/layout.tsx
@@ -0,0 +1,5 @@
+import { WithLayout } from "app/layoutHOC";
+
+import { getLayout } from "~/bookings/views/bookings-listing-view";
+
+export default WithLayout({ getLayout });
diff --git a/apps/web/modules/bookings/views/bookings-listing-view.tsx b/apps/web/modules/bookings/views/bookings-listing-view.tsx
index 3cb024ffa0..cf8d8a702c 100644
--- a/apps/web/modules/bookings/views/bookings-listing-view.tsx
+++ b/apps/web/modules/bookings/views/bookings-listing-view.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useAutoAnimate } from "@formkit/auto-animate/react";
-import { Fragment, useState } from "react";
+import { Fragment, ReactElement, useState } from "react";
 import { z } from "zod";
 
 import { WipeMyCalActionButton } from "@calcom/app-store/wipemycalother/components";
@@ -139,36 +139,59 @@ export default function Bookings({ status }: { status: (typeof validStatuses)[nu
   const [animationParentRef] = useAutoAnimate<HTMLDivElement>();
 
   return (
-    <Shell
-      withoutMain={false}
-      hideHeadingOnMobile
-      heading={t("bookings")}
-      subtitle={t("bookings_description")}
-      title={t("bookings")}
-      description={t("bookings_description")}>
-      <div className="flex flex-col">
-        <div className="flex flex-row flex-wrap justify-between">
-          <HorizontalTabs tabs={tabs} />
-          <FilterToggle setIsFiltersVisible={setIsFiltersVisible} />
-        </div>
-        <FiltersContainer isFiltersVisible={isFiltersVisible} />
-        <main className="w-full">
-          <div className="flex w-full flex-col" ref={animationParentRef}>
-            {query.status === "error" && (
-              <Alert severity="error" title={t("something_went_wrong")} message={query.error.message} />
-            )}
-            {(query.status === "pending" || query.isPaused) && <SkeletonLoader />}
-            {query.status === "success" && !isEmpty && (
-              <>
-                {!!bookingsToday.length && status === "upcoming" && (
-                  <div className="mb-6 pt-2 xl:pt-0">
-                    <WipeMyCalActionButton bookingStatus={status} bookingsEmpty={isEmpty} />
-                    <p className="text-subtle mb-2 text-xs font-medium uppercase leading-4">{t("today")}</p>
-                    <div className="border-subtle overflow-hidden rounded-md border">
-                      <table className="w-full max-w-full table-fixed">
-                        <tbody className="bg-default divide-subtle divide-y" data-testid="today-bookings">
-                          <Fragment>
-                            {bookingsToday.map((booking: BookingOutput) => (
+    <div className="flex flex-col">
+      <div className="flex flex-row flex-wrap justify-between">
+        <HorizontalTabs tabs={tabs} />
+        <FilterToggle setIsFiltersVisible={setIsFiltersVisible} />
+      </div>
+      <FiltersContainer isFiltersVisible={isFiltersVisible} />
+      <main className="w-full">
+        <div className="flex w-full flex-col" ref={animationParentRef}>
+          {query.status === "error" && (
+            <Alert severity="error" title={t("something_went_wrong")} message={query.error.message} />
+          )}
+          {(query.status === "pending" || query.isPaused) && <SkeletonLoader />}
+          {query.status === "success" && !isEmpty && (
+            <>
+              {!!bookingsToday.length && status === "upcoming" && (
+                <div className="mb-6 pt-2 xl:pt-0">
+                  <WipeMyCalActionButton bookingStatus={status} bookingsEmpty={isEmpty} />
+                  <p className="text-subtle mb-2 text-xs font-medium uppercase leading-4">{t("today")}</p>
+                  <div className="border-subtle overflow-hidden rounded-md border">
+                    <table className="w-full max-w-full table-fixed">
+                      <tbody className="bg-default divide-subtle divide-y" data-testid="today-bookings">
+                        <Fragment>
+                          {bookingsToday.map((booking: BookingOutput) => (
+                            <BookingListItem
+                              key={booking.id}
+                              loggedInUser={{
+                                userId: user?.id,
+                                userTimeZone: user?.timeZone,
+                                userTimeFormat: user?.timeFormat,
+                                userEmail: user?.email,
+                              }}
+                              listingStatus={status}
+                              recurringInfo={recurringInfoToday}
+                              {...booking}
+                            />
+                          ))}
+                        </Fragment>
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              )}
+              <div className="pt-2 xl:pt-0">
+                <div className="border-subtle overflow-hidden rounded-md border">
+                  <table data-testid={`${status}-bookings`} className="w-full max-w-full table-fixed">
+                    <tbody className="bg-default divide-subtle divide-y" data-testid="bookings">
+                      {query.data.pages.map((page, index) => (
+                        <Fragment key={index}>
+                          {page.bookings.filter(filterBookings).map((booking: BookingOutput) => {
+                            const recurringInfo = page.recurringInfo.find(
+                              (info) => info.recurringEventId === booking.recurringEventId
+                            );
+                            return (
                               <BookingListItem
                                 key={booking.id}
                                 loggedInUser={{
@@ -178,73 +201,59 @@ export default function Bookings({ status }: { status: (typeof validStatuses)[nu
                                   userEmail: user?.email,
                                 }}
                                 listingStatus={status}
-                                recurringInfo={recurringInfoToday}
+                                recurringInfo={recurringInfo}
                                 {...booking}
                               />
-                            ))}
-                          </Fragment>
-                        </tbody>
-                      </table>
-                    </div>
-                  </div>
-                )}
-                <div className="pt-2 xl:pt-0">
-                  <div className="border-subtle overflow-hidden rounded-md border">
-                    <table data-testid={`${status}-bookings`} className="w-full max-w-full table-fixed">
-                      <tbody className="bg-default divide-subtle divide-y" data-testid="bookings">
-                        {query.data.pages.map((page, index) => (
-                          <Fragment key={index}>
-                            {page.bookings.filter(filterBookings).map((booking: BookingOutput) => {
-                              const recurringInfo = page.recurringInfo.find(
-                                (info) => info.recurringEventId === booking.recurringEventId
-                              );
-                              return (
-                                <BookingListItem
-                                  key={booking.id}
-                                  loggedInUser={{
-                                    userId: user?.id,
-                                    userTimeZone: user?.timeZone,
-                                    userTimeFormat: user?.timeFormat,
-                                    userEmail: user?.email,
-                                  }}
-                                  listingStatus={status}
-                                  recurringInfo={recurringInfo}
-                                  {...booking}
-                                />
-                              );
-                            })}
-                          </Fragment>
-                        ))}
-                      </tbody>
-                    </table>
-                  </div>
-                  <div className="text-default p-4 text-center" ref={buttonInView.ref}>
-                    <Button
-                      color="minimal"
-                      loading={query.isFetchingNextPage}
-                      disabled={!query.hasNextPage}
-                      onClick={() => query.fetchNextPage()}>
-                      {query.hasNextPage ? t("load_more_results") : t("no_more_results")}
-                    </Button>
-                  </div>
+                            );
+                          })}
+                        </Fragment>
+                      ))}
+                    </tbody>
+                  </table>
+                </div>
+                <div className="text-default p-4 text-center" ref={buttonInView.ref}>
+                  <Button
+                    color="minimal"
+                    loading={query.isFetchingNextPage}
+                    disabled={!query.hasNextPage}
+                    onClick={() => query.fetchNextPage()}>
+                    {query.hasNextPage ? t("load_more_results") : t("no_more_results")}
+                  </Button>
                 </div>
-              </>
-            )}
-            {query.status === "success" && isEmpty && (
-              <div className="flex items-center justify-center pt-2 xl:pt-0">
-                <EmptyScreen
-                  Icon="calendar"
-                  headline={t("no_status_bookings_yet", { status: t(status).toLowerCase() })}
-                  description={t("no_status_bookings_yet_description", {
-                    status: t(status).toLowerCase(),
-                    description: t(descriptionByStatus[status]),
-                  })}
-                />
               </div>
-            )}
-          </div>
-        </main>
-      </div>
+            </>
+          )}
+          {query.status === "success" && isEmpty && (
+            <div className="flex items-center justify-center pt-2 xl:pt-0">
+              <EmptyScreen
+                Icon="calendar"
+                headline={t("no_status_bookings_yet", { status: t(status).toLowerCase() })}
+                description={t("no_status_bookings_yet_description", {
+                  status: t(status).toLowerCase(),
+                  description: t(descriptionByStatus[status]),
+                })}
+              />
+            </div>
+          )}
+        </div>
+      </main>
+    </div>
+  );
+}
+
+function BookingsStatusLayout({ children }: { children: React.ReactNode }) {
+  const { t } = useLocale();
+  return (
+    <Shell
+      withoutMain={false}
+      hideHeadingOnMobile
+      heading={t("bookings")}
+      subtitle={t("bookings_description")}
+      title={t("bookings")}
+      description={t("bookings_description")}>
+      {children}
     </Shell>
   );
 }
+
+export const getLayout = (page: ReactElement) => <BookingsStatusLayout>{page}</BookingsStatusLayout>;