diff --git a/src/app/tools/tankopedia/[id]/components/Characteristics/components/Modules.tsx b/src/app/tools/tankopedia/[id]/components/Characteristics/components/Modules.tsx
index ef5fa7848..a6466cdaf 100644
--- a/src/app/tools/tankopedia/[id]/components/Characteristics/components/Modules.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Characteristics/components/Modules.tsx
@@ -213,6 +213,7 @@ export function Modules() {
 
           return (
             <Flex
+              key={unlock.id}
               align="center"
               direction="column"
               gap="2"
diff --git a/src/app/tools/tankopedia/[id]/layout.tsx b/src/app/tools/tankopedia/[id]/layout.tsx
index 7363ca98b..a7379f6c6 100644
--- a/src/app/tools/tankopedia/[id]/layout.tsx
+++ b/src/app/tools/tankopedia/[id]/layout.tsx
@@ -3,6 +3,7 @@ import { tankDefinitions } from '../../../../core/blitzkit/tankDefinitions';
 import { TIER_ROMAN_NUMERALS } from '../../../../core/blitzkit/tankDefinitions/constants';
 import { tankIcon } from '../../../../core/blitzkit/tankIcon';
 import strings from '../../../../lang/en-US.json';
+import * as Duel from '../../../../stores/duel';
 
 interface TankopediaLayoutProps {
   children: ReactNode;
@@ -22,7 +23,7 @@ export default async function TankopediaLayout({
   const description = `Statistics, armor profiles, and equipment for ${tank.name}`;
 
   return (
-    <>
+    <Duel.Provider>
       <title>{title}</title>
       <meta name="description" content={description} />
       <meta property="og:title" content={title} />
@@ -30,6 +31,6 @@ export default async function TankopediaLayout({
       <meta property="og:description" content={description} />
 
       {children}
-    </>
+    </Duel.Provider>
   );
 }
diff --git a/src/app/tools/tankopedia/layout.tsx b/src/app/tools/tankopedia/layout.tsx
index ac81d2445..c3755df7b 100644
--- a/src/app/tools/tankopedia/layout.tsx
+++ b/src/app/tools/tankopedia/layout.tsx
@@ -5,12 +5,10 @@ import * as TankopediaSort from '../../../stores/tankopediaSort';
 
 export default function Layout({ children }: { children: React.ReactNode }) {
   return (
-    <Duel.Provider>
       <TankopediaPersistent.Provider>
         <TankopediaEphemeral.Provider>
           <TankopediaSort.Provider>{children}</TankopediaSort.Provider>
         </TankopediaEphemeral.Provider>
-      </TankopediaPersistent.Provider>
-    </Duel.Provider>
+      </TankopediaPersistent.Provider> 
   );
 }