diff --git a/src/mbgl/algorithm/generate_clip_ids_impl.hpp b/src/mbgl/algorithm/generate_clip_ids_impl.hpp
index 6a316dcda..fedab0602 100644
--- a/src/mbgl/algorithm/generate_clip_ids_impl.hpp
+++ b/src/mbgl/algorithm/generate_clip_ids_impl.hpp
@@ -64,7 +64,7 @@ void ClipIDGenerator::update(std::vector<std::reference_wrapper<Renderable>> ren
         uint8_t count = 1;
         for (auto& it : renderables) {
             auto& renderable = it.get();
-            if (!renderable.used) {
+            if (!renderable.used || !renderable.needsClipping) {
                 continue;
             }
             renderable.clip.mask |= mask;