diff --git a/src/mbgl/map/tile_worker.cpp b/src/mbgl/map/tile_worker.cpp
index 88bbf16a3f3..96300a803ff 100644
--- a/src/mbgl/map/tile_worker.cpp
+++ b/src/mbgl/map/tile_worker.cpp
@@ -287,6 +287,6 @@ void TileWorker::createSymbolBucket(const GeometryTileLayer& layer,
 
 void TileWorker::insertBucket(const std::string& name, std::unique_ptr<Bucket> bucket) {
     if (bucket->hasData()) {
-        result.buckets.emplace_back(name, std::move(bucket));
+        result.buckets.emplace(name, std::move(bucket));
     }
 }
diff --git a/src/mbgl/map/tile_worker.hpp b/src/mbgl/map/tile_worker.hpp
index 27fc0d37fea..44868a12ffa 100644
--- a/src/mbgl/map/tile_worker.hpp
+++ b/src/mbgl/map/tile_worker.hpp
@@ -31,7 +31,7 @@ class GeometryTileLayer;
 class TileParseResultBuckets {
 public:
     TileData::State state = TileData::State::invalid;
-    std::vector<std::pair<std::string, std::unique_ptr<Bucket>>> buckets;
+    std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
 };
 
 using TileParseResult = mapbox::util::variant<TileParseResultBuckets, // success
diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/map/vector_tile_data.cpp
index 0241b82b987..90603c0a648 100644
--- a/src/mbgl/map/vector_tile_data.cpp
+++ b/src/mbgl/map/vector_tile_data.cpp
@@ -39,6 +39,7 @@ VectorTileData::VectorTileData(const TileID& id_,
 
         if (!tile) {
             state = State::parsed;
+            buckets.clear();
             callback();
             return;
         }
@@ -69,9 +70,7 @@ VectorTileData::VectorTileData(const TileID& id_,
 
                 // Move over all buckets we received in this parse request, potentially overwriting
                 // existing buckets in case we got a refresh parse.
-                for (auto& bucket : resultBuckets.buckets) {
-                    buckets[bucket.first] = std::move(bucket.second);
-                }
+                buckets = std::move(resultBuckets.buckets);
 
                 // The target configuration could have changed since we started placement. In this case,
                 // we're starting another placement run.