diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/layout.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/layout.tsx
index 1dab820d4..a5156a76b 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/layout.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/layout.tsx
@@ -1,22 +1,7 @@
-import { Suspense } from "react"
-
-import ChildrenWrapper from "@/components/ChildrenWrapper"
-
 import styles from "./layout.module.css"
 
 export default function AlternativeHotelsLayout({
   children,
 }: React.PropsWithChildren) {
-  return (
-    <div className={styles.layout}>
-      {/* 
-        This Suspense is only needed to prevent useSearchParams from
-        making everything rendered client-side 
-        https://nextjs.org/docs/14/app/api-reference/functions/use-search-params#static-rendering
-      */}
-      <Suspense fallback={null}>
-        <ChildrenWrapper>{children}</ChildrenWrapper>
-      </Suspense>
-    </div>
-  )
+  return <div className={styles.layout}>{children}</div>
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/layout.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/layout.tsx
index 212e4d298..2cc3fcf7c 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/layout.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/layout.tsx
@@ -1,22 +1,7 @@
-import { Suspense } from "react"
-
-import ChildrenWrapper from "@/components/ChildrenWrapper"
-
 import styles from "./layout.module.css"
 
 export default function SelectHotelLayout({
   children,
 }: React.PropsWithChildren) {
-  return (
-    <div className={styles.layout}>
-      {/* 
-        This Suspense is only needed to prevent useSearchParams from
-        making everything rendered client-side 
-        https://nextjs.org/docs/14/app/api-reference/functions/use-search-params#static-rendering
-      */}
-      <Suspense fallback={null}>
-        <ChildrenWrapper>{children}</ChildrenWrapper>
-      </Suspense>
-    </div>
-  )
+  return <div className={styles.layout}>{children}</div>
 }
diff --git a/apps/scandic-web/components/ChildrenWrapper.tsx b/apps/scandic-web/components/ChildrenWrapper.tsx
deleted file mode 100644
index 33cd01c13..000000000
--- a/apps/scandic-web/components/ChildrenWrapper.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-"use client"
-import { useSearchParams } from "next/navigation"
-import { Fragment } from "react"
-
-// Solution derived from leerobs example
-// https://github.com/vercel/next.js/issues/53543#issuecomment-2327883526
-// Ensure children are re-rendered when the search query changes
-export default function ChildrenWrapper({ children }: React.PropsWithChildren) {
-  const searchParams = useSearchParams()
-  return <Fragment key={searchParams.toString()}>{children}</Fragment>
-}