diff --git a/src/app/tools/session/layout.tsx b/src/app/tools/session/layout.tsx
new file mode 100644
index 000000000..42dd882e5
--- /dev/null
+++ b/src/app/tools/session/layout.tsx
@@ -0,0 +1,6 @@
+import { ReactNode } from 'react';
+import * as Session from '../../../stores/session';
+
+export default function Layout({ children }: { children: ReactNode }) {
+  return <Session.Provider>{children}</Session.Provider>;
+}
diff --git a/src/app/tools/session/page.tsx b/src/app/tools/session/page.tsx
index 7bb4b6328..f13d37320 100644
--- a/src/app/tools/session/page.tsx
+++ b/src/app/tools/session/page.tsx
@@ -45,10 +45,7 @@ import { tankDefinitions } from '../../../core/blitzkit/tankDefinitions';
 import { tankAverages } from '../../../core/blitzstars/tankAverages';
 import { deltaTankStats } from '../../../core/statistics/deltaTankStats';
 import { useWideFormat } from '../../../hooks/useWideFormat';
-import mutateSession, {
-  SessionTracking,
-  useSession,
-} from '../../../stores/session';
+import * as Session from '../../../stores/session';
 import { IndividualTankStats } from '../../../types/tanksStats';
 
 export default function Page({
@@ -66,7 +63,8 @@ export default function Page({
   const [showCCInaccessibilityPrompt, setShowCCInaccessibilityPrompt] =
     useState(false);
   const input = useRef<HTMLInputElement>(null);
-  const session = useSession();
+  const session = Session.use();
+  const mutateSession = Session.useMutation();
   const [tankStatsB, setTankStatsB] = useState<IndividualTankStats[] | null>(
     null,
   );
@@ -133,7 +131,7 @@ export default function Page({
       if (!input.current) return;
 
       draft.tracking = true;
-      (draft as SessionTracking).player = {
+      (draft as Session.SessionTracking).player = {
         id,
         region,
         since: Date.now(),
@@ -347,7 +345,7 @@ export default function Page({
                 }
 
                 mutateSession((draft) => {
-                  (draft as SessionTracking).player.stats = stats;
+                  (draft as Session.SessionTracking).player.stats = stats;
                 });
               }}
             >
@@ -405,9 +403,9 @@ export default function Page({
                             key={key}
                             onClick={() => {
                               mutateSession((draft) => {
-                                (draft as SessionTracking).columns.unshift(
-                                  key as Stat,
-                                );
+                                (
+                                  draft as Session.SessionTracking
+                                ).columns.unshift(key as Stat);
                               });
                             }}
                           >
@@ -423,9 +421,12 @@ export default function Page({
                     onValueChange={(value) => {
                       mutateSession((draft) => {
                         if (value === 'remove') {
-                          (draft as SessionTracking).columns.splice(index, 1);
+                          (draft as Session.SessionTracking).columns.splice(
+                            index,
+                            1,
+                          );
                         } else {
-                          (draft as SessionTracking).columns[index] =
+                          (draft as Session.SessionTracking).columns[index] =
                             value as Stat;
                         }
                       });
diff --git a/src/stores/session.ts b/src/stores/session.ts
index f748cad37..062a6fcd3 100644
--- a/src/stores/session.ts
+++ b/src/stores/session.ts
@@ -1,9 +1,9 @@
-import { produce } from 'immer';
 import { merge } from 'lodash';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { Region } from '../constants/regions';
 import { Stat } from '../core/blitz/generateStats';
+import { createNextSafeStore } from '../core/zustand/createNextSafeStore';
 import { IndividualTankStats } from '../types/tanksStats';
 
 interface SessionBase {
@@ -26,16 +26,15 @@ interface SessionNotTracking extends SessionBase {
 
 type Session = SessionTracking | SessionNotTracking;
 
-export const useSession = create<Session>()(
-  persist(
-    (set) => ({
-      columns: ['battles', 'winrate', 'wn8', 'averageDamage'],
-      tracking: false,
-    }),
-    { name: 'session-2', merge: (a, b) => merge(b, a) },
-  ),
+export const { Provider, use, useMutation, useStore } = createNextSafeStore(
+  () =>
+    create<Session>()(
+      persist(
+        (set) => ({
+          columns: ['battles', 'winrate', 'wn8', 'averageDamage'],
+          tracking: false,
+        }),
+        { name: 'session-2', merge: (a, b) => merge(b, a) },
+      ),
+    ),
 );
-
-export default function mutateSession(recipe: (draft: Session) => void) {
-  useSession.setState(produce(recipe));
-}