diff --git a/src/app/App.tsx b/src/app/App.tsx
index 07b7e3bf..3af8a24b 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -10342,6 +10342,19 @@ export function App({ store, initialStatusMessage }: AppProps) {
     );
   };
 
+  const applySceneShowCelestialBodies = (enabled: boolean) => {
+    applyWorldSettings(
+      {
+        ...editorState.document.world,
+        showCelestialBodies: enabled
+      },
+      enabled ? "Enable celestial body overlay" : "Disable celestial body overlay",
+      enabled
+        ? "Sun and moon overlays now render in the sky."
+        : "Sun and moon overlays are now hidden."
+    );
+  };
+
   const applyAdvancedRenderingSettings = (
     label: string,
     successMessage: string,
@@ -13900,6 +13913,27 @@ export function App({ store, initialStatusMessage }: AppProps) {
                   </div>
                 </div>
 
+                <div className="form-section">
+                  <label className="form-field form-field--toggle">
+                    <span className="label">Show Sun &amp; Moon</span>
+                    <input
+                      data-testid="world-show-celestial-bodies"
+                      type="checkbox"
+                      checked={editorState.document.world.showCelestialBodies}
+                      onChange={(event) =>
+                        applySceneShowCelestialBodies(
+                          event.currentTarget.checked
+                        )
+                      }
+                    />
+                  </label>
+                  <div className="material-summary">
+                    Draws shader-based sun and moon overlays at the current
+                    resolved light directions in both the editor viewport and
+                    the runner.
+                  </div>
+                </div>
+
                 <Panel title="Day Environment">
                   <div className="stat-card">
                     <div
diff --git a/src/viewport-three/viewport-host.ts b/src/viewport-three/viewport-host.ts
index 8a4b85ae..8a87d207 100644
--- a/src/viewport-three/viewport-host.ts
+++ b/src/viewport-three/viewport-host.ts
@@ -298,6 +298,11 @@ interface TerrainBrushHit {
   point: Vec3;
 }
 
+interface LightVolumeRenderObjects {
+  group: Group;
+  lights: PointLight[];
+}
+
 interface ActiveTerrainBrushStroke {
   pointerId: number;
   previewTerrain: Terrain;