diff --git a/js/id/ui/preset/address.js b/js/id/ui/preset/address.js
index ad2657dab..219ba7ca2 100644
--- a/js/id/ui/preset/address.js
+++ b/js/id/ui/preset/address.js
@@ -82,7 +82,10 @@ iD.ui.preset.address = function(field, context) {
             .on('change', change);
 
         street
-            .call(d3.combobox().data(getStreets()));
+            .call(d3.combobox()
+                .fetcher(function(value, __, callback) {
+                    callback(getStreets());
+                }));
     }
 
     function change() {