diff --git a/BaseClasses.py b/BaseClasses.py
index 7efa1903..dc943c2b 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -1106,7 +1106,7 @@ class CollectionState(object):
             region = self.world.get_region(regionname, player)
             return region.can_reach(self) and ((self.world.mode[player] != 'inverted' and region.is_light_world) or (self.world.mode[player] == 'inverted' and region.is_dark_world) or self.has('Pearl', player))
 
-        for region in rupee_farms:
+        for region in rupee_farms if self.world.pottery[player] in ['none', 'keys', 'dungeon'] else ['Archery Game']:
             if can_reach_non_bunny(region):
                 return True
 
@@ -1188,7 +1188,7 @@ class CollectionState(object):
             return region.can_reach(self) and ((self.world.mode[player] != 'inverted' and region.is_light_world) or (self.world.mode[player] == 'inverted' and region.is_dark_world) or self.has('Pearl', player))
 
         # bomb pickups
-        for region in bush_bombs + bomb_caves:
+        for region in bush_bombs + (bomb_caves if self.world.pottery[player] in ['none', 'keys', 'dungeon'] else []):
             if can_reach_non_bunny(region):
                 return True