diff --git a/module/freebies/freebies.py b/module/freebies/freebies.py
index 19f02f52f..ce04a21d6 100644
--- a/module/freebies/freebies.py
+++ b/module/freebies/freebies.py
@@ -22,8 +22,9 @@ class Freebies(ModuleBase):
         logger.hr('Mail', level=1)
         MailWhite(self.config, self.device).run()
 
-        if self.config.SupplyPack_Collect:
-            logger.hr('Supply pack', level=1)
-            SupplyPack(self.config, self.device).run()
+        if self.config.SERVER in ['tw']:
+            if self.config.SupplyPack_Collect:
+                logger.hr('Supply pack', level=1)
+                SupplyPack(self.config, self.device).run()
 
         self.config.task_delay(server_update=True)
diff --git a/module/private_quarters/private_quarters.py b/module/private_quarters/private_quarters.py
index 88b321be9..1b665458d 100644
--- a/module/private_quarters/private_quarters.py
+++ b/module/private_quarters/private_quarters.py
@@ -4,7 +4,7 @@ from module.logger import logger
 from module.private_quarters.assets import *
 from module.private_quarters.interact import PQInteract
 from module.private_quarters.shop import PQShop
-from module.ui.page import page_private_quarters
+from module.ui.page import page_private_quarters, page_dormmenu
 
 
 class PrivateQuarters(PQInteract, PQShop):
@@ -157,6 +157,7 @@ class PrivateQuarters(PQInteract, PQShop):
             out: page_main, may have info_bar
         """
         if server.server in ['cn', 'en', 'jp']:
+            self.ui_ensure(page_dormmenu)
             self.ui_goto(page_private_quarters, get_ship=False)
             self.handle_info_bar()
 
diff --git a/module/shop/shop_reward.py b/module/shop/shop_reward.py
index 073925463..a8f55f2e9 100644
--- a/module/shop/shop_reward.py
+++ b/module/shop/shop_reward.py
@@ -10,22 +10,21 @@ from module.shop_event.ui import OCR_EVENT_SHOP_SECOND_ENSURE
 
 class RewardShop(ShopUI):
     def run_frequent(self):
-        self.config.task_delay(server_update=True)
-        self.config.task_stop()
+        if self.config.SERVER in ['tw']:
+            # Munitions shops
+            self.ui_goto_shop()
 
-        # Munitions shops
-        self.ui_goto_shop()
-
-        self.device.click_record_clear()
-        self.shop_tab.set(main=self, left=2)
-        self.shop_nav.set(main=self, upper=1)
-        GeneralShop(self.config, self.device).run()
+            self.device.click_record_clear()
+            self.shop_tab.set(main=self, left=2)
+            self.shop_nav.set(main=self, upper=1)
+            GeneralShop(self.config, self.device).run()
 
         self.config.task_delay(server_update=True)
 
     def run_once(self):
-        self.config.task_delay(server_update=True)
-        self.config.task_stop()
+        if self.config.SERVER in ['tw']:
+            # Munitions shops
+            self.ui_goto_shop()
 
         # Munitions shops
         if self.config.EventShop_Enable:
@@ -38,26 +37,26 @@ class RewardShop(ShopUI):
                     EventShop(self.config, self.device).run()
         else:
             self.ui_goto_shop()
+            
+            self.device.click_record_clear()
+            self.shop_tab.set(main=self, left=2)
+            self.shop_nav.set(main=self, upper=2)
+            MeritShop(self.config, self.device).run()
 
-        self.device.click_record_clear()
-        self.shop_tab.set(main=self, left=2)
-        self.shop_nav.set(main=self, upper=2)
-        MeritShop(self.config, self.device).run()
+            self.device.click_record_clear()
+            self.shop_tab.set(main=self, left=2)
+            self.shop_nav.set(main=self, upper=3)
+            GuildShop(self.config, self.device).run()
 
-        self.device.click_record_clear()
-        self.shop_tab.set(main=self, left=2)
-        self.shop_nav.set(main=self, upper=3)
-        GuildShop(self.config, self.device).run()
+            # core limited, core monthly, medal, prototype
+            self.device.click_record_clear()
+            self.shop_tab.set(main=self, left=1)
+            self.shop_nav.set(main=self, upper=2)
+            CoreShop(self.config, self.device).run()
 
-        # core limited, core monthly, medal, prototype
-        self.device.click_record_clear()
-        self.shop_tab.set(main=self, left=1)
-        self.shop_nav.set(main=self, upper=2)
-        CoreShop(self.config, self.device).run()
-
-        self.device.click_record_clear()
-        self.shop_tab.set(main=self, left=1)
-        self.shop_nav.set(main=self, upper=3)
-        MedalShop2(self.config, self.device).run()
+            self.device.click_record_clear()
+            self.shop_tab.set(main=self, left=1)
+            self.shop_nav.set(main=self, upper=3)
+            MedalShop2(self.config, self.device).run()
 
         self.config.task_delay(server_update=True)