diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 4965158a9..a58c74406 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -131,7 +131,7 @@ void GeometryTile::onLayout(LayoutResult result, const uint64_t resultCorrelatio
     (void)resultCorrelationID;
     nonSymbolBuckets = std::move(result.nonSymbolBuckets);
     pendingFeatureIndex = std::move(result.featureIndex);
-    data = std::move(result.tileData);
+    pendingData = std::move(result.tileData);
     observer->onTileChanged(*this);
 }
 
@@ -217,6 +217,9 @@ void GeometryTile::commitFeatureIndex() {
     if (pendingFeatureIndex) {
         featureIndex = std::move(pendingFeatureIndex);
     }
+    if (pendingData) {
+        data = std::move(pendingData);
+    }
 }
 
 void GeometryTile::queryRenderedFeatures(
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 1851ad749..00a4aafad 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -127,6 +127,7 @@ private:
     std::unique_ptr<FeatureIndex> featureIndex;
     std::unique_ptr<FeatureIndex> pendingFeatureIndex;
     std::unique_ptr<const GeometryTileData> data;
+    std::unique_ptr<const GeometryTileData> pendingData;
 
     optional<AlphaImage> glyphAtlasImage;
     optional<PremultipliedImage> iconAtlasImage;