diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl
index e4d5ab10ea..10302624d3 100755
--- a/admin/searchengine/elasticsearch/mappings.pl
+++ b/admin/searchengine/elasticsearch/mappings.pl
@@ -151,7 +151,7 @@ if ( $op eq 'edit' ) {
             my $mapping_facet       = $mapping_facet[$i];
             $mapping_facet = ( grep { $_ eq $search_field_name } @facetable_field_names ) ? $mapping_facet : 0;
             my $mapping_suggestible = $mapping_suggestible[$i];
-            my $mapping_sort        = $mapping_sort[$i] eq 'undef' ? undef : $mapping_sort[$i];
+            my $mapping_sort        = $mapping_sort[$i];
             my $mapping_search      = $mapping_search[$i];
 
             my $search_field = Koha::SearchFields->find({ name => $search_field_name }, { key => 'name' });
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
index adecb5af10..7e6c06e408 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
@@ -379,9 +379,8 @@ a.add, a.delete {
                                     </td>
                                     <td>
                                         <select data-id="mapping_sort">
-                                        <option value="undef">Undef</option>
-                                        <option value="0">0</option>
-                                        <option value="1">1</option>
+                                        <option value="0">No</option>
+                                        <option value="1">Yes</option>
                                         </select>
                                     </td>
                                     <td>