diff --git a/lua/app/common/local_data.lua b/lua/app/common/local_data.lua
index 2d6fcb89..7b6da257 100644
--- a/lua/app/common/local_data.lua
+++ b/lua/app/common/local_data.lua
@@ -432,16 +432,16 @@ function LocalData:GetMarktrailHero()
 end
 
 function LocalData:saveBattleSnapshot(snapshot)
-	self:setString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), json.encode(snapshot))
 	if EDITOR_MODE then
 		Logger.logHighlight(json.encode(snapshot))
 	end
+	self:setString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), json.encode(snapshot))
 end
 
 function LocalData:getBattleSnapshot()
 	local dealedSnapshot = self:getString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), "{}")
 	if EDITOR_MODE then
-		Logger.logHighlight(json.decode(dealedSnapshot))
+		Logger.logHighlight(dealedSnapshot)
 	end
 	return json.decode(dealedSnapshot)
 end
diff --git a/lua/app/ui/ui_manager.lua b/lua/app/ui/ui_manager.lua
index 25ab8567..89e80b14 100644
--- a/lua/app/ui/ui_manager.lua
+++ b/lua/app/ui/ui_manager.lua
@@ -983,6 +983,7 @@ function UIManager:backToLogin()
 end
 
 function UIManager:backToLoginWithoutLogout()
+	self:hideMessageBox()
 	self:stopCurrentBGM()
 	ModuleManager.TutorialManager:stopTutorial()