diff --git a/module/config/config_updater.py b/module/config/config_updater.py
index 5aa3ce6c6..b5e9c8e13 100644
--- a/module/config/config_updater.py
+++ b/module/config/config_updater.py
@@ -847,6 +847,7 @@ class ConfigUpdater:
             yield 'Rogue.RogueWorld.UseImmersifier', True
         elif key == 'Alas.Emulator.GameClient' and value == 'cloud_android':
             yield 'Alas.Emulator.PackageName', 'CN-Official'
+            yield 'Alas.Optimization.WhenTaskQueueEmpty', 'close_game'
 
     def iter_hidden_args(self, data) -> t.Iterator[str]:
         """
diff --git a/tasks/login/cloud.py b/tasks/login/cloud.py
index 06a35b20a..6f520e31c 100644
--- a/tasks/login/cloud.py
+++ b/tasks/login/cloud.py
@@ -288,8 +288,13 @@ class LoginAndroidCloud(ModuleBase):
         """
         logger.hr('Cloud ensure ingame', level=1)
 
-        if self.config.Emulator_GameClient != 'cloud_android':
-            self.config.Emulator_GameClient = 'cloud_android'
+        with self.config.multi_set():
+            if self.config.Emulator_GameClient != 'cloud_android':
+                self.config.Emulator_GameClient = 'cloud_android'
+            if self.config.Emulator_PackageName != 'CN-Official':
+                self.config.Emulator_PackageName = 'CN-Official'
+            if self.config.Optimization_WhenTaskQueueEmpty != 'close_game':
+                self.config.Optimization_WhenTaskQueueEmpty = 'close_game'
 
         for _ in range(3):
             if self.device.app_is_running():