diff --git a/src/app/tools/tankopedia/[id]/components/Lighting.tsx b/src/app/tools/tankopedia/[id]/components/Lighting.tsx
index 520c8d343..f6916a9f5 100644
--- a/src/app/tools/tankopedia/[id]/components/Lighting.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Lighting.tsx
@@ -3,7 +3,14 @@ import { useModel } from '../../../../../hooks/useModel';
 import { useDuel } from '../../../../../stores/duel';
 import { useTankopediaPersistent } from '../../../../../stores/tankopedia';
 
-export const ENVIRONMENTS = ['warehouse', 'dawn', 'sunset'] as const;
+export const ENVIRONMENTS = [
+  'lobby',
+  'apartment',
+  'warehouse',
+  'dawn',
+  'sunset',
+  'night',
+] as const;
 
 export function Lighting() {
   const protagonist = useDuel((state) => state.protagonist!);
diff --git a/src/stores/tankopedia.ts b/src/stores/tankopedia.ts
index e64d6bb87..da7e5067b 100644
--- a/src/stores/tankopedia.ts
+++ b/src/stores/tankopedia.ts
@@ -131,7 +131,7 @@ export const useTankopediaPersistent = create<TankopediaPersistent>()(
     subscribeWithSelector<TankopediaPersistent>(() => ({
       model: {
         visual: {
-          environment: 'warehouse',
+          environment: ENVIRONMENTS[0],
           controlsEnabled: true,
           showGrid: true,
           greenPenetration: false,