diff --git a/installer/data/mysql/atomicupdate/bug_32707.pl b/installer/data/mysql/atomicupdate/bug_32707.pl
new file mode 100755
index 0000000000..ca09bc8578
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_32707.pl
@@ -0,0 +1,16 @@
+use Modern::Perl;
+
+return {
+    bug_number  => "32707",
+    description => "Add `ESPreventAutoTruncate` preference",
+    up          => sub {
+        my ($args) = @_;
+        my ( $dbh, $out ) = @$args{qw(dbh out)};
+        $dbh->do(
+            q{
+            INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
+            VALUES ('ESPreventAutoTruncate', 'barcode|control-number|control-number-identifier|date-of-acquisition|date-of-publication|date-time-last-modified|identifier-standard|isbn|issn|itype|lc-card-number|number-local-acquisition|other-control-number|record-control-number', NULL, 'List of searchfields (separated by | or ,) that should not be autotruncated by Elasticsearch even if QueryAutoTruncate is set to Yes', 'Free')
+        }
+        );
+    },
+};
diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
index 73f08eb688..79f25930e8 100644
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ b/installer/data/mysql/mandatory/sysprefs.sql
@@ -248,6 +248,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('ERMProviderEbscoApiKey', '', '', 'API key for EBSCO', 'free'),
 ('ERMProviderEbscoCustomerID', '', '', 'Customer ID for EBSCO', 'free'),
 ('ERMProviders', 'local', 'local|ebsco', 'Set the providers for the ERM module', 'Choice'),
+('ESPreventAutoTruncate', 'barcode|control-number|control-number-identifier|date-of-acquisition|date-of-publication|date-time-last-modified|identifier-standard|isbn|issn|itype|lc-card-number|number-local-acquisition|other-control-number|record-control-number', NULL, 'List of searchfields (separated by | or ,) that should not be autotruncated by Elasticsearch even if QueryAutoTruncate is set to Yes', 'free'),
 ('ExcludeHolidaysFromMaxPickUpDelay', '0', NULL, 'If ON, reserves max pickup delay takes into accountthe closed days.', 'YesNo'),
 ('expandedSearchOption','0',NULL,'If ON, set advanced search to be expanded by default','YesNo'),
 ('ExpireReservesAutoFill','0',NULL,'Automatically fill the next hold with a automatically canceled expired waiting hold.','YesNo'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
index 86b9f54ae1..71fe2db333 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
@@ -8,6 +8,7 @@ Searching:
                   1: automatically.
                   0: only if * is added.
             - "<br />(The * character would be used like so: <cite>Har*</cite> or <cite>*logging</cite>.)"
+            - <strong>NOTE:</strong> record identifiers (biblionumber, authid) will never be autotruncated.
         -
             - pref: QueryFuzzy
               type: boolean
@@ -94,6 +95,10 @@ Searching:
                   1: Enable
                   0: Disable
             - "the option for staff with permission to create/edit custom saved search filters."
+        -
+            - 'List of searchfields (separated by | or ,) that should not be autotruncated by Elasticsearch even if <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=UseCashRegisters">QueryAutoTruncate</a> is set to Yes:'
+            - pref: ESPreventAutoTruncate
+              class: long
     Search form:
         -
             - pref: LoadSearchHistoryToTheFirstLoggedUser