diff --git a/query/autocomplete.js b/query/autocomplete.js
index 6cae73fc7..ad98b1307 100644
--- a/query/autocomplete.js
+++ b/query/autocomplete.js
@@ -47,12 +47,6 @@ query.score( views.ngrams_last_token_only_multi( adminFields ), 'must' );
 query.score( views.admin_multi_match_first( adminFields ), 'must');
 query.score( views.admin_multi_match_last( adminFields ), 'must');
 
-// address components
-query.score( peliasQuery.view.address('housenumber') );
-query.score( peliasQuery.view.address('street') );
-query.score( peliasQuery.view.address('cross_street') );
-query.score( peliasQuery.view.address('postcode') );
-
 // scoring boost
 query.score( peliasQuery.view.focus( views.ngrams_strict ) );
 query.score( peliasQuery.view.popularity( peliasQuery.view.leaf.match_all ) );
diff --git a/test/unit/fixture/autocomplete_single_character_street.js b/test/unit/fixture/autocomplete_single_character_street.js
index 0f6ed21a2..fce06d111 100644
--- a/test/unit/fixture/autocomplete_single_character_street.js
+++ b/test/unit/fixture/autocomplete_single_character_street.js
@@ -33,16 +33,6 @@ module.exports = {
         }
       }],
       'should':[
-        {
-          'match': {
-            'address_parts.street': {
-              'query': 'k road',
-              'cutoff_frequency': 0.01,
-              'boost': 1,
-              'analyzer': 'peliasQuery'
-            }
-          }
-        },
         {
         'function_score': {
           'query': {