diff --git a/src/app/tools/tankopedia/[id]/layout.tsx b/src/app/tools/tankopedia/[id]/layout.tsx
index e2ea7fb52..d4d7e7542 100644
--- a/src/app/tools/tankopedia/[id]/layout.tsx
+++ b/src/app/tools/tankopedia/[id]/layout.tsx
@@ -6,7 +6,6 @@ import { TIER_ROMAN_NUMERALS } from '../../../../core/blitzkit/tankDefinitions/c
 import { tankIcon } from '../../../../core/blitzkit/tankIcon';
 import strings from '../../../../lang/en-US.json';
 import * as Duel from '../../../../stores/duel';
-import * as TankFilters from '../../../../stores/tankFilters';
 import * as TankopediaEphemeral from '../../../../stores/tankopediaEphemeral';
 
 export default async function Layout({
@@ -29,22 +28,20 @@ export default async function Layout({
 
   return (
     <TankopediaEphemeral.Provider data={tankModelDefinition}>
-      <TankFilters.Provider>
-        <Duel.Provider
-          data={{
-            tank: awaitedTankDefinitions[id],
-            provisionDefinitions: awaitedProvisionDefinitions,
-          }}
-        >
-          <title>{title}</title>
-          <meta name="description" content={description} />
-          <meta property="og:title" content={title} />
-          <meta property="og:image" content={tankIcon(id)} />
-          <meta property="og:description" content={description} />
+      <Duel.Provider
+        data={{
+          tank: awaitedTankDefinitions[id],
+          provisionDefinitions: awaitedProvisionDefinitions,
+        }}
+      >
+        <title>{title}</title>
+        <meta name="description" content={description} />
+        <meta property="og:title" content={title} />
+        <meta property="og:image" content={tankIcon(id)} />
+        <meta property="og:description" content={description} />
 
-          {children}
-        </Duel.Provider>
-      </TankFilters.Provider>
+        {children}
+      </Duel.Provider>
     </TankopediaEphemeral.Provider>
   );
 }
diff --git a/src/app/tools/tankopedia/layout.tsx b/src/app/tools/tankopedia/layout.tsx
index 90aa0fa5b..f4cc51323 100644
--- a/src/app/tools/tankopedia/layout.tsx
+++ b/src/app/tools/tankopedia/layout.tsx
@@ -1,10 +1,13 @@
+import * as TankFilters from '../../../stores/tankFilters';
 import * as TankopediaPersistent from '../../../stores/tankopediaPersistent';
 import * as TankopediaSort from '../../../stores/tankopediaSort';
 
 export default function Layout({ children }: { children: React.ReactNode }) {
   return (
-    <TankopediaPersistent.Provider>
+    <TankFilters.Provider>
+      <TankopediaPersistent.Provider>
         <TankopediaSort.Provider>{children}</TankopediaSort.Provider>
-    </TankopediaPersistent.Provider>
+      </TankopediaPersistent.Provider>
+    </TankFilters.Provider>
   );
 }
diff --git a/src/app/tools/tankopedia/page.tsx b/src/app/tools/tankopedia/page.tsx
index 92158b251..72190e2c5 100644
--- a/src/app/tools/tankopedia/page.tsx
+++ b/src/app/tools/tankopedia/page.tsx
@@ -1,13 +1,10 @@
 import PageWrapper from '../../../components/PageWrapper';
-import * as TankFilters from '../../../stores/tankFilters';
 import { TankSearch } from './components/TankSearch';
 
 export default function Page() {
   return (
-    <TankFilters.Provider>
       <PageWrapper color="purple" size={1028}>
         <TankSearch />
       </PageWrapper>
-    </TankFilters.Provider>
   );
 }