diff --git a/data/entrance_shuffle_data.yaml b/data/entrance_shuffle_data.yaml
index bc7f9ad9..4549683b 100644
--- a/data/entrance_shuffle_data.yaml
+++ b/data/entrance_shuffle_data.yaml
@@ -1461,7 +1461,7 @@
     exit_infos: 
       - stage: F302
         room: 0
-        index: 4
+        index: 0
     spawn_info:
       - stage: F303
         layer: 0
@@ -1795,7 +1795,7 @@
     exit_infos: 
       - stage: F201_1
         room: 0
-        index: 2
+        index: 0
     spawn_info:
       - stage: F200
         layer: 0
diff --git a/logic/world.py b/logic/world.py
index 51431db0..8022b66f 100644
--- a/logic/world.py
+++ b/logic/world.py
@@ -449,6 +449,12 @@ def set_nonprogress_locations(self):
                 for location in dungeon.locations:
                     location.progression = False
 
+        # Set beedle's shop items as nonprogress if they can only contain junk
+        if self.setting("randomized_shops") == "junk_only":
+            for location in self.location_table.values():
+                if "Beedle's Shop Purchases" in location.types:
+                    location.progression = False
+
     # Remove or add junk to the item pool until the total number of
     # items is equal to the number of currently empty locations
     def sanitize_item_pool(self) -> None: