diff --git a/include/mbgl/util/feature.hpp b/include/mbgl/util/feature.hpp
index c9dbc3176..7747d34ee 100644
--- a/include/mbgl/util/feature.hpp
+++ b/include/mbgl/util/feature.hpp
@@ -13,7 +13,7 @@ public:
     Feature(geometry_type&& geometry_)
         : mapbox::geometry::feature<double> { std::move(geometry_) } {}
 
-    optional<Value> id {};
+    optional<uint64_t> id;
 };
 
 } // namespace mbgl
diff --git a/platform/node/src/node_feature.cpp b/platform/node/src/node_feature.cpp
index 7175f9d1f..1a5e31fe9 100644
--- a/platform/node/src/node_feature.cpp
+++ b/platform/node/src/node_feature.cpp
@@ -159,7 +159,7 @@ v8::Local<v8::Object> toJS(const Feature& feature) {
     Nan::Set(result, Nan::New("properties").ToLocalChecked(), toJS(feature.properties));
 
     if (feature.id) {
-        Nan::Set(result, Nan::New("id").ToLocalChecked(), toJS(*feature.id));
+        Nan::Set(result, Nan::New("id").ToLocalChecked(), Nan::New(double(*feature.id)));
     }
 
     return scope.Escape(result);
diff --git a/src/mbgl/geometry/feature_index.cpp b/src/mbgl/geometry/feature_index.cpp
index d3d523af0..fb68b572b 100644
--- a/src/mbgl/geometry/feature_index.cpp
+++ b/src/mbgl/geometry/feature_index.cpp
@@ -123,11 +123,7 @@ void FeatureIndex::addFeature(
 
         Feature feature { mapbox::geometry::point<double>() };
         feature.properties = geometryTileFeature->getProperties();
-
-        optional<uint64_t> id = geometryTileFeature->getID();
-        if (id) {
-            feature.id = Value(*id);
-        }
+        feature.id = geometryTileFeature->getID();
 
         result[layerID].push_back(std::move(feature));
     }