diff --git a/app/src/main/java/org/vibecoders/moongazer/managers/Assets.java b/app/src/main/java/org/vibecoders/moongazer/managers/Assets.java
index 70b32ef..b4d6772 100644
--- a/app/src/main/java/org/vibecoders/moongazer/managers/Assets.java
+++ b/app/src/main/java/org/vibecoders/moongazer/managers/Assets.java
@@ -77,6 +77,10 @@ public class Assets {
         return loadedAll;
     }
 
+    public static boolean isStartLoadAll() {
+        return startLoadAll;
+    }
+
     public static void waitUntilLoaded() {
         assetManager.finishLoading();
         if (startLoadAll) {
diff --git a/app/src/main/java/org/vibecoders/moongazer/scenes/Scene.java b/app/src/main/java/org/vibecoders/moongazer/scenes/Scene.java
index d5a4c4c..e7c8f95 100644
--- a/app/src/main/java/org/vibecoders/moongazer/scenes/Scene.java
+++ b/app/src/main/java/org/vibecoders/moongazer/scenes/Scene.java
@@ -8,7 +8,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 public abstract class Scene {
     protected final Logger log = org.slf4j.LoggerFactory.getLogger(getClass());
     public Scene() {
-        if (!Assets.isLoadedAll()) {
+        if (!Assets.isLoadedAll() && Assets.isStartLoadAll()) {
             Assets.waitUntilLoaded();
         }
     }