diff --git a/src/dusk/randomizer/generator/logic/world.cpp b/src/dusk/randomizer/generator/logic/world.cpp
index 7fc35239a2..d0caf8d041 100644
--- a/src/dusk/randomizer/generator/logic/world.cpp
+++ b/src/dusk/randomizer/generator/logic/world.cpp
@@ -1017,7 +1017,11 @@ namespace randomizer::logic::world
             utility::random::ShufflePool(bottleLocations);
             for (auto& bottleLocation : bottleLocations)
             {
-                bottleLocation->SetCurrentItem(utility::random::PopRandomElement(bottlePool));
+                if (!bottlePool.empty()) {
+                    bottleLocation->SetCurrentItem(utility::random::PopRandomElement(bottlePool));
+                } else {
+                    bottleLocation->SetCurrentItem(this->GetItem("Empty Bottle"));
+                }
             }
         }
     }