diff --git a/src/app/tools/tankopedia/[id]/components/Lighting.tsx b/src/app/tools/tankopedia/[id]/components/Lighting.tsx
index 894970b48..ed563c828 100644
--- a/src/app/tools/tankopedia/[id]/components/Lighting.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Lighting.tsx
@@ -4,8 +4,8 @@ import * as Duel from '../../../../../stores/duel';
 import * as TankopediaPersistent from '../../../../../stores/tankopediaPersistent';
 
 export const ENVIRONMENTS = [
-  'lobby',
   'apartment',
+  'lobby',
   'warehouse',
   'dawn',
   'sunset',
@@ -18,7 +18,7 @@ export function Lighting() {
     (state) => state.model.visual.showEnvironment,
   );
   const environment = TankopediaPersistent.use(
-    (state) => state.model.visual.environment,
+    (state) => state.model.visual.environmentV2,
   );
 
   return (
diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
index 04ced02d9..3a5a27798 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/components/Options.tsx
@@ -73,7 +73,7 @@ export function Options({ thicknessRange }: OptionsProps) {
   const opaque = TankopediaPersistent.use((state) => state.model.visual.opaque);
   const fullScreenAvailable = useFullscreenAvailability();
   const environment = TankopediaPersistent.use(
-    (state) => state.model.visual.environment,
+    (state) => state.model.visual.environmentV2,
   );
   const developerMode = App.use((state) => state.developerMode);
   const antagonistGun = Duel.use((state) => state.antagonist.gun);
@@ -610,7 +610,7 @@ export function Options({ thicknessRange }: OptionsProps) {
                         value={environment}
                         onClick={() => {
                           mutateTankopediaPersistent((draft) => {
-                            draft.model.visual.environment = environment;
+                            draft.model.visual.environmentV2 = environment;
                           });
                         }}
                       >
diff --git a/src/stores/tankopediaPersistent/index.ts b/src/stores/tankopediaPersistent/index.ts
index 13c7a1aae..39c2779d3 100644
--- a/src/stores/tankopediaPersistent/index.ts
+++ b/src/stores/tankopediaPersistent/index.ts
@@ -17,7 +17,7 @@ export interface TankopediaPersistent {
     visual: {
       wireframe: boolean;
       opaque: boolean;
-      environment: (typeof ENVIRONMENTS)[number];
+      environmentV2: (typeof ENVIRONMENTS)[number];
       showGrid: boolean;
       greenPenetration: boolean;
       showEnvironment: boolean;
@@ -53,7 +53,7 @@ export const { Provider, use, useMutation, useStore } = createNextSafeStore(
               showPrimaryArmor: true,
               wireframe: false,
               opaque: false,
-              environment: ENVIRONMENTS[0],
+              environmentV2: ENVIRONMENTS[0],
               showGrid: true,
               greenPenetration: false,
               showEnvironment: false,