diff --git a/Assets/02.Scripts/Map/MapManager.cs b/Assets/02.Scripts/Map/MapManager.cs
index d0c0601ea..7f22b2d82 100644
--- a/Assets/02.Scripts/Map/MapManager.cs
+++ b/Assets/02.Scripts/Map/MapManager.cs
@@ -66,6 +66,7 @@ namespace BlueWater.Maps
             {
                 element.ResetMap(true);
             }
+            GameManager.Instance.CurrentCombatPlayer.SetCurrentHealthPointMax();
             AudioManager.Instance.StopBgm();
         }
 
@@ -81,6 +82,13 @@ namespace BlueWater.Maps
         
         public void MoveSelectStage(int stage)
         {
+            _currentMapController = GetMapController(DataManager.Instance.CurrentSaveStage);
+            if (_currentMapController != null)
+            {
+                _currentMapController.ResetMap();
+            }
+            GameManager.Instance.CurrentCombatPlayer.SetCurrentHealthPointMax();
+            AudioManager.Instance.StopBgm();
             var moveMapController = GetMapController((SaveStage)stage);
             moveMapController.MovePlayer();
         }