diff --git a/platform/darwin/src/MGLComputedShapeSource.mm b/platform/darwin/src/MGLComputedShapeSource.mm
index 04734d0ef50..5f5427838f7 100644
--- a/platform/darwin/src/MGLComputedShapeSource.mm
+++ b/platform/darwin/src/MGLComputedShapeSource.mm
@@ -125,7 +125,7 @@ - (void)main {
                                                  zoomLevel:self.z];
     }
 
-    if(![self isCancelled]) {
+    if(![self isCancelled] && data.count > 0) {
         mbgl::FeatureCollection featureCollection;
         featureCollection.reserve(data.count);
         for (MGLShape <MGLFeature> * feature in data) {