diff --git a/src/app/tools/tankopedia/layout.tsx b/src/app/tools/tankopedia/layout.tsx
index b15897aad..1d3b927f1 100644
--- a/src/app/tools/tankopedia/layout.tsx
+++ b/src/app/tools/tankopedia/layout.tsx
@@ -1,5 +1,13 @@
+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 <TankopediaSort.Provider>{children}</TankopediaSort.Provider>;
+  return (
+    <TankopediaPersistent.Provider>
+      <TankopediaEphemeral.Provider>
+        <TankopediaSort.Provider>{children}</TankopediaSort.Provider>
+      </TankopediaEphemeral.Provider>
+    </TankopediaPersistent.Provider>
+  );
 }
diff --git a/src/stores/tankopediaEphemeral.ts b/src/stores/tankopediaEphemeral.ts
index 1d21efc74..6d22455f5 100644
--- a/src/stores/tankopediaEphemeral.ts
+++ b/src/stores/tankopediaEphemeral.ts
@@ -1,3 +1,5 @@
+'use client';
+
 import { Vector3 } from 'three';
 import { create } from 'zustand';
 import { subscribeWithSelector } from 'zustand/middleware';
diff --git a/src/stores/tankopediaPersistent/index.ts b/src/stores/tankopediaPersistent/index.ts
index 5ce3ba0fd..190c9ad49 100644
--- a/src/stores/tankopediaPersistent/index.ts
+++ b/src/stores/tankopediaPersistent/index.ts
@@ -1,3 +1,5 @@
+'use client';
+
 import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist, subscribeWithSelector } from 'zustand/middleware';