diff --git a/src/app/(main)/settings/teams/[teamId]/layout.tsx b/src/app/(main)/settings/teams/[teamId]/layout.tsx
new file mode 100644
index 00000000..dfe95bd3
--- /dev/null
+++ b/src/app/(main)/settings/teams/[teamId]/layout.tsx
@@ -0,0 +1,6 @@
+'use client';
+import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';
+
+export default function ({ children, params: { teamId } }) {
+  return <TeamProvider teamId={teamId}>{children}</TeamProvider>;
+}
diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx
index ef0e12d1..2ba4d177 100644
--- a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx
@@ -1,5 +1,4 @@
 'use client';
-import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';
 import TeamMembersDataTable from './TeamMembersDataTable';
 import PageHeader from 'components/layout/PageHeader';
 import { useMessages } from 'components/hooks';
@@ -8,10 +7,10 @@ export function TeamMembersPage({ teamId }: { teamId: string }) {
   const { formatMessage, labels } = useMessages();
 
   return (
-    <TeamProvider teamId={teamId}>
+    <>
       <PageHeader title={formatMessage(labels.members)} />
       <TeamMembersDataTable teamId={teamId} allowEdit={true} />
-    </TeamProvider>
+    </>
   );
 }
 
diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx b/src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx
index 7f84106c..e6fbd10a 100644
--- a/src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx
@@ -1,13 +1,8 @@
 'use client';
-import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';
 import TeamDetails from './TeamDetails';
 
 export function TeamPage({ teamId }: { teamId: string }) {
-  return (
-    <TeamProvider teamId={teamId}>
-      <TeamDetails teamId={teamId} />
-    </TeamProvider>
-  );
+  return <TeamDetails teamId={teamId} />;
 }
 
 export default TeamPage;
diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx
index 56582c04..d600c9cd 100644
--- a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx
@@ -1,5 +1,4 @@
 'use client';
-import TeamProvider from 'app/(main)/teams/[teamId]/TeamProvider';
 import TeamWebsitesDataTable from './TeamWebsitesDataTable';
 import PageHeader from 'components/layout/PageHeader';
 import { useMessages } from 'components/hooks';
@@ -8,10 +7,10 @@ export function TeamWebsitesPage({ teamId }: { teamId: string }) {
   const { formatMessage, labels } = useMessages();
 
   return (
-    <TeamProvider teamId={teamId}>
+    <>
       <PageHeader title={formatMessage(labels.websites)} />
       <TeamWebsitesDataTable teamId={teamId} allowEdit={true} />
-    </TeamProvider>
+    </>
   );
 }