diff --git a/src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java b/src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java
index b403ceb29..54d0b64dc 100644
--- a/src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java
+++ b/src/main/java/emu/grasscutter/game/player/PlayerProgressManager.java
@@ -1,5 +1,6 @@
 package emu.grasscutter.game.player;
 
+import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
 import static emu.grasscutter.scripts.constants.EventType.EVENT_UNLOCK_TRANS_POINT;
 
 import emu.grasscutter.data.GameData;
@@ -76,10 +77,11 @@ public final class PlayerProgressManager extends BasePlayerDataManager {
         // Add statue quests if necessary.
         this.addStatueQuestsOnLogin();
 
-        // Auto-unlock the first statue and map area, until we figure out how to make
-        // that particular statue interactable.
-        this.player.getUnlockedScenePoints(3).add(7);
-        this.player.getUnlockedSceneAreas(3).add(1);
+        if (!GAME_OPTIONS.questing) {
+            // Auto-unlock the first statue and map area.
+            this.player.getUnlockedScenePoints(3).add(7);
+            this.player.getUnlockedSceneAreas(3).add(1);
+        }
     }
 
     /**********
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java
index f4ddaaab3..da435d986 100644
--- a/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java
+++ b/src/main/java/emu/grasscutter/game/quest/exec/ExecUnlockPoint.java
@@ -13,6 +13,9 @@ public class ExecUnlockPoint extends QuestExecHandler {
         // Unlock the trans point for the player.
         int sceneId = Integer.parseInt(paramStr[0]);
         int pointId = Integer.parseInt(paramStr[1]);
+
+        // TODO: Determine if the point is a statue.
+        // This is currently a hardcoded value.
         boolean isStatue = quest.getMainQuestId() == 303 || quest.getMainQuestId() == 352;
 
         // Done.