diff --git a/metrics/integration/expression-tests/index-of/with-from-index/test.json b/metrics/integration/expression-tests/index-of/with-from-index/test.json
index 52a029e7b..6351cb238 100644
--- a/metrics/integration/expression-tests/index-of/with-from-index/test.json
+++ b/metrics/integration/expression-tests/index-of/with-from-index/test.json
@@ -11,6 +11,9 @@
       [{}, {"properties": {"needle": 7, "hay": [9, 8, 7, 8, 7, 7], "i": 3}}],
       [{}, {"properties": {"needle": 9, "hay": [9, 8, 7, 8, 7, 7], "i": 1}}],
       [{}, {"properties": {"needle": 8, "hay": [9, 8, 7, 8, 7, 7], "i": 1}}],
+      [{}, {"properties": {"needle": 8, "hay": [9, 8, 7, 8, 7, 7], "i": -1}}],
+      [{}, {"properties": {"needle": "foo", "hay": ["foo", "foo"], "i": -100}}],
+      [{}, {"properties": {"needle": "foo", "hay": "__foo__foo", "i": -100}}],
       [{}, {"properties": {"needle": 8, "hay": [9, 8, 7, 8, 7, 7], "i": 10000}}],
       [{}, {"properties": {"needle": 8, "hay": [9, 8, 7, 8, 7, 7], "i": "wrong"}}]
     ],
@@ -35,6 +38,9 @@
         4,
         -1,
         1,
+        1,
+        0,
+        2,
         -1,
         {
           "error": "Expected third argument to be of type number, but found string instead."
diff --git a/src/mbgl/style/expression/index_of.cpp b/src/mbgl/style/expression/index_of.cpp
index dfff3fff9..ecb7e514d 100644
--- a/src/mbgl/style/expression/index_of.cpp
+++ b/src/mbgl/style/expression/index_of.cpp
@@ -41,7 +41,7 @@ EvaluationResult IndexOf::evaluate(const EvaluationContext &params) const {
             return EvaluationError{"Expected third argument to be of type number, but found " +
                                    toString(typeOf(*evaluatedFromIndex)) + " instead."};
         }
-        fromIndexValue = static_cast<size_t>(evaluatedFromIndex->get<double>());
+        fromIndexValue = static_cast<size_t>(std::max(evaluatedFromIndex->get<double>(), 0.0));
     }
 
     return evaluatedInput->match(