diff --git a/module/map/fleet.py b/module/map/fleet.py
index 46447cfc0..c47da5a7c 100644
--- a/module/map/fleet.py
+++ b/module/map/fleet.py
@@ -376,7 +376,10 @@ class Fleet(Camera, AmbushHandler):
                     elif may_submarine_icon and grid.predict_current_fleet():
                         arrive_predict = '(may_submarine_icon, is_current_fleet)'
                         arrive_checker = True
-                    elif self.config.MAP_WALK_USE_CURRENT_FLEET and grid.predict_current_fleet():
+                    elif self.config.MAP_WALK_USE_CURRENT_FLEET \
+                            and expected != 'combat_boss' \
+                            and not ('combat' in expected and grid.may_boss) \
+                            and grid.predict_current_fleet():
                         arrive_predict = '(MAP_WALK_USE_CURRENT_FLEET, is_current_fleet)'
                         arrive_checker = True
                     elif walk_timeout.reached() and grid.predict_current_fleet():