1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/data_driven_property_evaluator.hpp b/src/mbgl/renderer/data_driven_property_evaluator.hpp
index efac9e4532..c2e6d9f283 100644
--- a/src/mbgl/renderer/data_driven_property_evaluator.hpp
+++ b/src/mbgl/renderer/data_driven_property_evaluator.hpp
@@ -26,14 +26,14 @@ public:
 
     ResultType operator()(const style::PropertyExpression<T>& expression) const {
         if (useIntegerZoom) {  // Compiler will optimize out the unused branch.
-            if (!expression.isFeatureConstant()) {
+            if (!expression.isFeatureConstant() || !expression.isRuntimeConstant()) {
                 auto returnExpression = expression;
                 returnExpression.useIntegerZoom = true;
                 return ResultType(returnExpression);
-            } 
+            }
             return ResultType(expression.evaluate(floor(parameters.z)));
         } else {
-            if (!expression.isFeatureConstant()) {
+            if (!expression.isFeatureConstant() || !expression.isRuntimeConstant()) {
                 return ResultType(expression);
             }
             return ResultType(expression.evaluate(parameters.z));
@@ -63,7 +63,7 @@ public:
     }
 
     ResultType operator()(const style::PropertyExpression<T>& expression) const {
-        if (!expression.isFeatureConstant()) {
+        if (!expression.isFeatureConstant() || !expression.isRuntimeConstant()) {
             return ResultType(expression);
         } else {
             const T evaluated = expression.evaluate(floor(parameters.z));