diff --git a/ItemList.py b/ItemList.py
index 9128436a..e79392b8 100644
--- a/ItemList.py
+++ b/ItemList.py
@@ -301,11 +301,6 @@ def generate_itempool(world, player):
         world.get_location(location, player).event = True
         world.get_location(location, player).locked = True
 
-    if world.bomblogic[player]:
-        for item in world.itempool:
-            if item.name == 'Bomb Upgrade (+10)' and item.player == player:
-                item.advancement = True
-
     if world.shopsanity[player]:
         for shop in world.shops[player]:
             if shop.region.name in shop_to_location_table:
@@ -323,6 +318,11 @@ def generate_itempool(world, player):
             p_item = next(item for item in items if item.name == potion and item.player == player)
             p_item.priority = True  # don't beemize one of each potion
 
+    if world.bomblogic[player]:
+        for item in items:
+            if item.name == 'Bomb Upgrade (+10)' and item.player == player:
+                item.advancement = True
+
     world.lamps_needed_for_dark_rooms = lamps_needed_for_dark_rooms
 
     if clock_mode is not None: