1 files changed, 4 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
index a38f810f1c..fe6d510a53 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyValue.java
@@ -46,7 +46,7 @@ public class PropertyValue<T> {
    * @return true if this is a expression, false if not
    */
   public boolean isExpression() {
-    return !isNull() && value instanceof JsonArray;
+    return !isNull() && (value instanceof JsonArray || value instanceof Expression);
   }
 
   /**
@@ -57,7 +57,9 @@ public class PropertyValue<T> {
   @Nullable
   public Expression getExpression() {
     if (isExpression()) {
-      return Expression.Converter.convert((JsonArray) value);
+      return value instanceof JsonArray
+        ? Expression.Converter.convert((JsonArray) value)
+        : (Expression) value;
     } else {
       Logger.w(TAG, "not a expression, try value");
       return null;