diff --git a/src/app/(main)/console/[[...websiteId]]/page.tsx b/src/app/(main)/console/[[...websiteId]]/page.tsx
index 2cbdddcc0..93eafee47 100644
--- a/src/app/(main)/console/[[...websiteId]]/page.tsx
+++ b/src/app/(main)/console/[[...websiteId]]/page.tsx
@@ -5,7 +5,9 @@ async function getEnabled() {
   return !!process.env.ENABLE_TEST_CONSOLE;
 }
 
-export default async function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   const enabled = await getEnabled();
 
   if (!enabled) {
diff --git a/src/app/(main)/reports/[reportId]/page.tsx b/src/app/(main)/reports/[reportId]/page.tsx
index 690daf478..85a97d1ca 100644
--- a/src/app/(main)/reports/[reportId]/page.tsx
+++ b/src/app/(main)/reports/[reportId]/page.tsx
@@ -1,7 +1,9 @@
 import { Metadata } from 'next';
 import ReportPage from './ReportPage';
 
-export default function ({ params: { reportId } }) {
+export default async function ({ params }: { params: { reportId: string } }) {
+  const { reportId } = await params;
+
   return <ReportPage reportId={reportId} />;
 }
 
diff --git a/src/app/(main)/settings/users/[userId]/page.tsx b/src/app/(main)/settings/users/[userId]/page.tsx
index d5dc5005d..3b3a3fac9 100644
--- a/src/app/(main)/settings/users/[userId]/page.tsx
+++ b/src/app/(main)/settings/users/[userId]/page.tsx
@@ -1,7 +1,9 @@
 import UserPage from './UserPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { userId } }) {
+export default async function ({ params }: { params: { userId: string } }) {
+  const { userId } = await params;
+
   return <UserPage userId={userId} />;
 }
 
diff --git a/src/app/(main)/settings/websites/[websiteId]/page.tsx b/src/app/(main)/settings/websites/[websiteId]/page.tsx
index f3d87c788..7e2feaf26 100644
--- a/src/app/(main)/settings/websites/[websiteId]/page.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteSettingsPage from './WebsiteSettingsPage';
 import { Metadata } from 'next';
 
-export default async function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteSettingsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/settings/websites/page.tsx b/src/app/(main)/settings/websites/page.tsx
index d073b32b5..d05be0a5c 100644
--- a/src/app/(main)/settings/websites/page.tsx
+++ b/src/app/(main)/settings/websites/page.tsx
@@ -1,7 +1,9 @@
 import { Metadata } from 'next';
 import WebsitesSettingsPage from './WebsitesSettingsPage';
 
-export default function ({ params: { teamId } }: { params: { teamId: string } }) {
+export default async function ({ params }: { params: { teamId: string } }) {
+  const { teamId } = await params;
+
   return <WebsitesSettingsPage teamId={teamId} />;
 }
 
diff --git a/src/app/(main)/teams/[teamId]/layout.tsx b/src/app/(main)/teams/[teamId]/layout.tsx
index e10cdb943..0452ae976 100644
--- a/src/app/(main)/teams/[teamId]/layout.tsx
+++ b/src/app/(main)/teams/[teamId]/layout.tsx
@@ -2,7 +2,15 @@ import TeamProvider from './TeamProvider';
 import { Metadata } from 'next';
 import TeamSettingsLayout from './settings/TeamSettingsLayout';
 
-export default function ({ children, params: { teamId } }) {
+export default async function ({
+  children,
+  params,
+}: {
+  children: any;
+  params: { teamId: string };
+}) {
+  const { teamId } = await params;
+
   return (
     <TeamProvider teamId={teamId}>
       <TeamSettingsLayout>{children}</TeamSettingsLayout>
diff --git a/src/app/(main)/teams/[teamId]/settings/members/page.tsx b/src/app/(main)/teams/[teamId]/settings/members/page.tsx
index fbee6a8ea..9810f7a20 100644
--- a/src/app/(main)/teams/[teamId]/settings/members/page.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/members/page.tsx
@@ -1,7 +1,9 @@
-import TeamMembersPage from './TeamMembersPage';
 import { Metadata } from 'next';
+import TeamMembersPage from './TeamMembersPage';
+
+export default async function ({ params }: { params: { teamId: string } }) {
+  const { teamId } = await params;
 
-export default function ({ params: { teamId } }) {
   return <TeamMembersPage teamId={teamId} />;
 }
 
diff --git a/src/app/(main)/teams/[teamId]/settings/team/page.tsx b/src/app/(main)/teams/[teamId]/settings/team/page.tsx
index 0c4dd2012..f15d5fb61 100644
--- a/src/app/(main)/teams/[teamId]/settings/team/page.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/team/page.tsx
@@ -1,7 +1,9 @@
 import { Metadata } from 'next';
 import TeamPage from './TeamPage';
 
-export default function ({ params: { teamId } }) {
+export default async function ({ params }: { params: { teamId: string } }) {
+  const { teamId } = await params;
+
   return <TeamPage teamId={teamId} />;
 }
 
diff --git a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
index cfb465fb4..6709eb671 100644
--- a/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
+++ b/src/app/(main)/teams/[teamId]/settings/websites/page.tsx
@@ -1,7 +1,9 @@
 import TeamWebsitesPage from './TeamWebsitesPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { teamId } }) {
+export default async function ({ params }: { params: { teamId: string } }) {
+  const { teamId } = await params;
+
   return <TeamWebsitesPage teamId={teamId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/compare/page.tsx b/src/app/(main)/websites/[websiteId]/compare/page.tsx
index b3009fcaa..bdd29bd54 100644
--- a/src/app/(main)/websites/[websiteId]/compare/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/compare/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteComparePage from './WebsiteComparePage';
 import { Metadata } from 'next';
 
-export default function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteComparePage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/events/page.tsx b/src/app/(main)/websites/[websiteId]/events/page.tsx
index b5dc4d62c..1b8882445 100644
--- a/src/app/(main)/websites/[websiteId]/events/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/events/page.tsx
@@ -1,7 +1,9 @@
 import { Metadata } from 'next';
 import EventsPage from './EventsPage';
 
-export default async function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <EventsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/layout.tsx b/src/app/(main)/websites/[websiteId]/layout.tsx
index f8756ea3e..1df69cd31 100644
--- a/src/app/(main)/websites/[websiteId]/layout.tsx
+++ b/src/app/(main)/websites/[websiteId]/layout.tsx
@@ -1,7 +1,15 @@
 import { Metadata } from 'next';
 import WebsiteProvider from './WebsiteProvider';
 
-export default function ({ children, params: { websiteId } }) {
+export default async function ({
+  children,
+  params,
+}: {
+  children: any;
+  params: { websiteId: string };
+}) {
+  const { websiteId } = await params;
+
   return <WebsiteProvider websiteId={websiteId}>{children}</WebsiteProvider>;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/page.tsx b/src/app/(main)/websites/[websiteId]/page.tsx
index 49bca9b6f..d3aa1633a 100644
--- a/src/app/(main)/websites/[websiteId]/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteDetailsPage from './WebsiteDetailsPage';
 import { Metadata } from 'next';
 
-export default function WebsitePage({ params: { websiteId } }) {
+export default async function WebsitePage({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteDetailsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/realtime/page.tsx b/src/app/(main)/websites/[websiteId]/realtime/page.tsx
index 0ca7ffd83..f205caddf 100644
--- a/src/app/(main)/websites/[websiteId]/realtime/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/realtime/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteRealtimePage from './WebsiteRealtimePage';
 import { Metadata } from 'next';
 
-export default function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteRealtimePage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/reports/page.tsx b/src/app/(main)/websites/[websiteId]/reports/page.tsx
index caa805a63..15c79de9a 100644
--- a/src/app/(main)/websites/[websiteId]/reports/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/reports/page.tsx
@@ -1,7 +1,9 @@
 import WebsiteReportsPage from './WebsiteReportsPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <WebsiteReportsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
index 952e8cc58..f4882880c 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/[sessionId]/page.tsx
@@ -1,7 +1,13 @@
 import SessionDetailsPage from './SessionDetailsPage';
 import { Metadata } from 'next';
 
-export default function WebsitePage({ params: { websiteId, sessionId } }) {
+export default async function WebsitePage({
+  params,
+}: {
+  params: { websiteId: string; sessionId: string };
+}) {
+  const { websiteId, sessionId } = await params;
+
   return <SessionDetailsPage websiteId={websiteId} sessionId={sessionId} />;
 }
 
diff --git a/src/app/(main)/websites/[websiteId]/sessions/page.tsx b/src/app/(main)/websites/[websiteId]/sessions/page.tsx
index 771f682dd..d1ff96f58 100644
--- a/src/app/(main)/websites/[websiteId]/sessions/page.tsx
+++ b/src/app/(main)/websites/[websiteId]/sessions/page.tsx
@@ -1,7 +1,9 @@
 import SessionsPage from './SessionsPage';
 import { Metadata } from 'next';
 
-export default function ({ params: { websiteId } }) {
+export default async function ({ params }: { params: { websiteId: string } }) {
+  const { websiteId } = await params;
+
   return <SessionsPage websiteId={websiteId} />;
 }
 
diff --git a/src/app/share/[...shareId]/page.tsx b/src/app/share/[...shareId]/page.tsx
index e8ca8e607..c06274aa0 100644
--- a/src/app/share/[...shareId]/page.tsx
+++ b/src/app/share/[...shareId]/page.tsx
@@ -1,5 +1,7 @@
 import SharePage from './SharePage';
 
-export default function ({ params: { shareId } }) {
+export default async function ({ params }: { params: { shareId: string } }) {
+  const { shareId } = await params;
+
   return <SharePage shareId={shareId[0]} />;
 }