diff --git a/BaseClasses.py b/BaseClasses.py
index c07af8e6..bf684b1f 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -415,8 +415,7 @@ class MultiWorld():
 
     def get_spheres(self):
         state = CollectionState(self)
-
-        locations = set(self.get_locations())
+        locations = set(self.get_filled_locations())
 
         while locations:
             sphere = set()
@@ -424,10 +423,7 @@ class MultiWorld():
             for location in locations:
                 if location.can_reach(state):
                     sphere.add(location)
-            sphere_list = list(sphere)
-            sphere_list.sort(key=lambda location: location.name)
-            self.random.shuffle(sphere_list)
-            yield sphere_list
+            yield sphere
             if not sphere:
                 if locations:
                     yield locations  # unreachable locations
diff --git a/worlds/alttp/Shops.py b/worlds/alttp/Shops.py
index 4be0cb0a..4c6e6871 100644
--- a/worlds/alttp/Shops.py
+++ b/worlds/alttp/Shops.py
@@ -164,7 +164,7 @@ def ShopSlotFill(world):
             blacklist_word in item_name for blacklist_word in blacklist_words)}
         blacklist_words.add("Bee")
 
-        locations_per_sphere = list(list(sphere) for sphere in world.get_spheres())
+        locations_per_sphere = list(list(sphere).sort(key=lambda location: location.name) for sphere in world.get_spheres())