diff --git a/lib/util/geocoder.js b/lib/util/geocoder.js
index c6ac8d6cf..3bdbf7957 100644
--- a/lib/util/geocoder.js
+++ b/lib/util/geocoder.js
@@ -132,6 +132,11 @@ class ArcGISGeocoder extends Geocoder {
    * format.
    */
   getLocationFromGeocodedFeature (feature) {
+    // If feature was returned from 'search' query, it will already be
+    // structured properly.
+    if (feature.geometry) return Geocoder.prototype.getLocationFromGeocodedFeature(feature)
+    // If feature returned from autocomplete, we need to use the magicKey to get
+    // the location's coordinates.
     return this.api.search({ magicKey: feature.magicKey, text: feature.text })
       .then(response => {
         const feature = response.features[0]