diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index 430c0c0b60..4bfd39a658 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -175,7 +175,6 @@ class TunicWorld(World):
         return TunicItem(name, classification, self.item_name_to_id[name], self.player)
 
     def create_items(self) -> None:
-
         tunic_items: List[TunicItem] = []
         self.slot_data_items = []
 
@@ -327,7 +326,7 @@ class TunicWorld(World):
             victory_region.locations.append(victory_location)
 
     def set_rules(self) -> None:
-        if self.options.entrance_rando or self.options.shuffle_ladders:
+        if self.options.entrance_rando or self.options.shuffle_ladders or self.options.combat_logic:
             set_er_location_rules(self)
         else:
             set_region_rules(self)
diff --git a/worlds/tunic/er_rules.py b/worlds/tunic/er_rules.py
index d0bebb1f97..5099f0a585 100644
--- a/worlds/tunic/er_rules.py
+++ b/worlds/tunic/er_rules.py
@@ -1376,5 +1376,5 @@ def set_er_location_rules(world: "TunicWorld") -> None:
         set_rule(multiworld.get_location("Cathedral Gauntlet - Gauntlet Reward", player),
                  lambda state: has_combat_logic(["Gauntlet"], state, player))
         if not world.options.hexagon_quest:
-            add_rule(multiworld.get_entrance("Heir Arena -> Heir Arena Victory", player),
+            add_rule(multiworld.get_entrance("Spirit Arena -> Spirit Arena Victory", player),
                      lambda state: has_combat_logic(["The Heir"], state, player))