diff --git a/Main.py b/Main.py
index a540a8671..6c95ffc78 100644
--- a/Main.py
+++ b/Main.py
@@ -159,14 +159,16 @@ def build_world_graphs(settings: Settings) -> list[World]:
         if world.settings.shuffle_dungeon_rewards in ('vanilla', 'reward'):
             world.fill_bosses()
 
-        if settings.empty_dungeons_mode == 'rewards':
-            world.set_empty_dungeon_rewards(settings.empty_dungeons_rewards)
-
     if settings.triforce_hunt:
         settings.distribution.configure_triforce_hunt(worlds)
 
     logger.info('Setting Entrances.')
     set_entrances(worlds, savewarps_to_connect)
+
+    for world in worlds:
+        if world.settings.empty_dungeons_mode == 'rewards':
+            world.set_empty_dungeon_rewards(world.settings.empty_dungeons_rewards)
+
     return worlds
 
 
diff --git a/World.py b/World.py
index 91491e5f9..32342dfa2 100644
--- a/World.py
+++ b/World.py
@@ -750,7 +750,7 @@ def fill_bosses(self, boss_count: int = 9) -> None:
             self.push_item(loc, item)
 
     def set_empty_dungeon_rewards(self, empty_rewards: list[str] = []) -> None:
-        empty_dungeon_bosses = list(map(lambda reward: self.find_items(reward)[0].name, empty_rewards))
+        empty_dungeon_bosses = list(map(lambda reward: self.find_items(reward)[0], empty_rewards))
         for boss in empty_dungeon_bosses:
             hint_area = HintArea.at(boss)
             if hint_area.dungeon_name in self.precompleted_dungeons: # filter out side dungeons and overworld