diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
index 607634c405..3e2cb1b784 100644
--- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
+++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm
@@ -643,7 +643,7 @@ sub _build_scan_query {
         $index => {
             terms => {
                 field => $index . '__facet',
-                order => { '_term' => 'asc' },
+                order => { '_key' => 'asc' },
                 include => $self->_create_regex_filter($self->clean_search_term($term)) . '.*'
             }
         }
diff --git a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
index 2991ee39b6..b4e2de938c 100755
--- a/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
+++ b/t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t
@@ -507,7 +507,7 @@ subtest 'build_query tests' => sub {
         $query->{aggregations}{'author'}{'terms'},
         {
             field => 'author__facet',
-            order => { '_term' => 'asc' },
+            order => { '_key' => 'asc' },
             include => '[nN][eE][wW].*'
         },
         "scan aggregation request is properly formed"
@@ -525,7 +525,7 @@ subtest 'build_query tests' => sub {
         $query->{aggregations}{'subject'}{'terms'},
         {
             field => 'subject__facet',
-            order => { '_term' => 'asc' },
+            order => { '_key' => 'asc' },
             include => '[nN][eE][wW].*'
         },
         "scan aggregation request is properly formed"