diff --git a/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java b/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
index f796d1ba5..e0cee6a71 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
@@ -55,7 +55,6 @@ public final class DungeonManager {
         this.dungeonData = dungeonData;
         this.passConfigData = GameData.getDungeonPassConfigDataMap().get(dungeonData.getPassCond());
         this.finishedConditions = new int[passConfigData.getConds().size()];
-        this.scene.setDungeonManager(this);
     }
 
     public void triggerEvent(DungeonPassConditionType conditionType, int... params) {
diff --git a/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java b/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
index c1ae5798e..4e855f571 100644
--- a/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
+++ b/src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
@@ -116,6 +116,7 @@ public class DungeonSystem extends BaseGameSystem {
 
         if (player.getWorld().transferPlayerToScene(player, sceneId, data)) {
             scene = player.getScene();
+            scene.setDungeonManager(new DungeonManager(scene, data));
             scene.addDungeonSettleObserver(basicDungeonSettleObserver);
         }