1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index c85f9ef713..977744248d 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -200,9 +200,10 @@ Bucket* GeometryTile::getBucket(const Layer::Impl& layer) const {
     if (it == buckets.end()) {
         return nullptr;
     }
-
-    assert(it->second);
-    return it->second.get();
+    Bucket* result = it->second.get();
+    assert(result);
+    // Bucket might be outdated, see issue #12432.
+    return result->supportsLayer(layer) ? result : nullptr;
 }
 
 float GeometryTile::getQueryPadding(const std::vector<const RenderLayer*>& layers) {