diff --git a/src/app/tools/tankopedia/[id]/layout.tsx b/src/app/tools/tankopedia/[id]/layout.tsx
index 61c38ed14..37c57ae08 100644
--- a/src/app/tools/tankopedia/[id]/layout.tsx
+++ b/src/app/tools/tankopedia/[id]/layout.tsx
@@ -6,6 +6,7 @@ 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({
   children,
@@ -24,21 +25,23 @@ export default async function Layout({
   const description = `Statistics, armor, and equipment for ${tank.name}`;
 
   return (
-    <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} />
+    <TankopediaEphemeral.Provider>
+      <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} />
 
-        {children}
-      </Duel.Provider>
-    </TankFilters.Provider>
+          {children}
+        </Duel.Provider>
+      </TankFilters.Provider>
+    </TankopediaEphemeral.Provider>
   );
 }
diff --git a/src/app/tools/tankopedia/layout.tsx b/src/app/tools/tankopedia/layout.tsx
index c3755df7b..90aa0fa5b 100644
--- a/src/app/tools/tankopedia/layout.tsx
+++ b/src/app/tools/tankopedia/layout.tsx
@@ -1,14 +1,10 @@
-import * as Duel from '../../../stores/duel';
-import * as TankopediaEphemeral from '../../../stores/tankopediaEphemeral';
 import * as TankopediaPersistent from '../../../stores/tankopediaPersistent';
 import * as TankopediaSort from '../../../stores/tankopediaSort';
 
 export default function Layout({ children }: { children: React.ReactNode }) {
   return (
-      <TankopediaPersistent.Provider>
-        <TankopediaEphemeral.Provider>
-          <TankopediaSort.Provider>{children}</TankopediaSort.Provider>
-        </TankopediaEphemeral.Provider>
-      </TankopediaPersistent.Provider> 
+    <TankopediaPersistent.Provider>
+        <TankopediaSort.Provider>{children}</TankopediaSort.Provider>
+    </TankopediaPersistent.Provider>
   );
 }