diff --git a/src/mbgl/annotation/annotation_source.cpp b/src/mbgl/annotation/annotation_source.cpp
index cc82b34de..61fc4ca2e 100644
--- a/src/mbgl/annotation/annotation_source.cpp
+++ b/src/mbgl/annotation/annotation_source.cpp
@@ -15,8 +15,7 @@ AnnotationSource::Impl::Impl(Source& base_)
 }
 
 Range<uint8_t> AnnotationSource::Impl::getZoomRange() {
-    // Same as default geojson-vt-cpp.
-    return { 0, 18 };
+    return { 0, 22 };
 }
 
 void AnnotationSource::Impl::load(FileSource&) {
diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp
index 2236f179b..445ee7651 100644
--- a/src/mbgl/annotation/shape_annotation_impl.cpp
+++ b/src/mbgl/annotation/shape_annotation_impl.cpp
@@ -27,7 +27,7 @@ void ShapeAnnotationImpl::updateTileData(const CanonicalTileID& tileID, Annotati
             return Feature { std::move(geom) };
         }));
         mapbox::geojsonvt::Options options;
-        options.maxZoom = util::clamp<uint8_t>(maxZoom, 0, 18);
+        options.maxZoom = maxZoom;
         options.buffer = 255u;
         options.extent = util::EXTENT;
         options.tolerance = baseTolerance;