diff --git a/worlds/oot/Rules.py b/worlds/oot/Rules.py
index 3da3728c..529411f6 100644
--- a/worlds/oot/Rules.py
+++ b/worlds/oot/Rules.py
@@ -227,7 +227,8 @@ def set_shop_rules(ootworld):
 # The goal is to automatically set item rules based on age requirements in case entrances were shuffled
 def set_entrances_based_rules(ootworld):
 
-    all_state = ootworld.multiworld.get_all_state(False)
+    all_state = ootworld.get_state_with_complete_itempool()
+    all_state.sweep_for_events(locations=ootworld.get_locations())
 
     for location in filter(lambda location: location.type == 'Shop', ootworld.get_locations()):
         # If a shop is not reachable as adult, it can't have Goron Tunic or Zora Tunic as child can't buy these
diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py
index 9466e7c0..e9c889d6 100644
--- a/worlds/oot/__init__.py
+++ b/worlds/oot/__init__.py
@@ -829,8 +829,8 @@ class OOTWorld(World):
         # Kill unreachable events that can't be gotten even with all items
         # Make sure to only kill actual internal events, not in-game "events"
         all_state = self.get_state_with_complete_itempool()
-        all_state.sweep_for_events()
         all_locations = self.get_locations()
+        all_state.sweep_for_events(locations=all_locations)
         reachable = self.multiworld.get_reachable_locations(all_state, self.player)
         unreachable = [loc for loc in all_locations if
                        (loc.internal or loc.type == 'Drop') and loc.event and loc.locked and loc not in reachable]
@@ -858,7 +858,7 @@ class OOTWorld(World):
             state = base_state.copy()
             for item in self.get_pre_fill_items():
                 self.collect(state, item)
-            state.sweep_for_events(self.get_locations())
+            state.sweep_for_events(locations=self.get_locations())
             return state
 
         # Prefill shops, songs, and dungeon items
@@ -870,7 +870,7 @@ class OOTWorld(World):
         state = CollectionState(self.multiworld)
         for item in self.itempool:
             self.collect(state, item)
-        state.sweep_for_events(self.get_locations())
+        state.sweep_for_events(locations=self.get_locations())
 
         # Place dungeon items
         special_fill_types = ['GanonBossKey', 'BossKey', 'SmallKey', 'HideoutSmallKey', 'Map', 'Compass']