diff --git a/Koha/SearchEngine/Elasticsearch.pm b/Koha/SearchEngine/Elasticsearch.pm
index 3d932b6dce..7322f84178 100644
--- a/Koha/SearchEngine/Elasticsearch.pm
+++ b/Koha/SearchEngine/Elasticsearch.pm
@@ -296,6 +296,9 @@ sub reset_elasticsearch_mappings {
     my ( $self ) = @_;
     my $indexes = $self->_load_elasticsearch_mappings();
 
+    Koha::SearchMarcMaps->delete;
+    Koha::SearchFields->delete;
+
     while ( my ( $index_name, $fields ) = each %$indexes ) {
         while ( my ( $field_name, $data ) = each %$fields ) {
 
diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl
index 28802f6586..8bbbdadbc5 100755
--- a/admin/searchengine/elasticsearch/mappings.pl
+++ b/admin/searchengine/elasticsearch/mappings.pl
@@ -166,8 +166,6 @@ if ( $op eq 'edit' ) {
     }
 }
 elsif( $op eq 'reset_confirmed' ) {
-    Koha::SearchMarcMaps->delete;
-    Koha::SearchFields->delete;
     Koha::SearchEngine::Elasticsearch->reset_elasticsearch_mappings;
     $clear_cache->();
     push @messages, { type => 'message', code => 'success_on_reset' };