diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/loading.tsx b/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/loading.tsx
deleted file mode 100644
index aed94918c..000000000
--- a/app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/loading.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import BreadcrumbsSkeleton from "@/components/Breadcrumbs/BreadcrumbsSkeleton"
-
-export default function Loading() {
-  return <BreadcrumbsSkeleton />
-}
diff --git a/app/[lang]/(live)/@bookingwidget/[...path]/loading.tsx b/app/[lang]/(live)/@bookingwidget/[...path]/loading.tsx
deleted file mode 100644
index 1c031d2a1..000000000
--- a/app/[lang]/(live)/@bookingwidget/[...path]/loading.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../loading"
diff --git a/app/[lang]/(live)/@footer/[...path]/loading.tsx b/app/[lang]/(live)/@footer/[...path]/loading.tsx
deleted file mode 100644
index 1c031d2a1..000000000
--- a/app/[lang]/(live)/@footer/[...path]/loading.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../loading"
diff --git a/app/[lang]/(live)/@header/[...path]/loading.tsx b/app/[lang]/(live)/@header/[...path]/loading.tsx
deleted file mode 100644
index 1c031d2a1..000000000
--- a/app/[lang]/(live)/@header/[...path]/loading.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../loading"
diff --git a/app/[lang]/(live)/@header/loading.tsx b/app/[lang]/(live)/@header/loading.tsx
deleted file mode 100644
index a54009331..000000000
--- a/app/[lang]/(live)/@header/loading.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import HeaderFallback from "@/components/Current/Header/HeaderFallback"
-
-export default function LoadingFooter() {
-  return <HeaderFallback />
-}
diff --git a/app/[lang]/(live)/@header/page.tsx b/app/[lang]/(live)/@header/page.tsx
index 9d777ffef..51e91035d 100644
--- a/app/[lang]/(live)/@header/page.tsx
+++ b/app/[lang]/(live)/@header/page.tsx
@@ -1,6 +1,9 @@
+import { Suspense } from "react"
+
 import { env } from "@/env/server"
 
 import CurrentHeader from "@/components/Current/Header"
+import HeaderFallback from "@/components/Current/Header/HeaderFallback"
 import Header from "@/components/Header"
 import { setLang } from "@/i18n/serverContext"
 
@@ -10,7 +13,11 @@ export default function HeaderPage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
 
   if (env.HIDE_FOR_NEXT_RELEASE) {
-    return <CurrentHeader />
+    return (
+      <Suspense fallback={<HeaderFallback />}>
+        <CurrentHeader />
+      </Suspense>
+    )
   }
 
   return <Header />
diff --git a/app/[lang]/(live)/@sitewidealert/[...path]/loading.tsx b/app/[lang]/(live)/@sitewidealert/[...path]/loading.tsx
deleted file mode 100644
index 1c031d2a1..000000000
--- a/app/[lang]/(live)/@sitewidealert/[...path]/loading.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from "../loading"