diff --git a/debian/scripts/koha-es-indexer b/debian/scripts/koha-es-indexer
index c28963f733..e5b67e61fe 100755
--- a/debian/scripts/koha-es-indexer
+++ b/debian/scripts/koha-es-indexer
@@ -163,7 +163,7 @@ set_action()
 
 op=""
 quiet="no"
-batch_size=10
+batch_size=$(get_es_indexer_batch_size ${name})
 
 # Read command line parameters
 while [ $# -gt 0 ]; do
diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh
index ade6e3c197..fbfe788604 100755
--- a/debian/scripts/koha-functions.sh
+++ b/debian/scripts/koha-functions.sh
@@ -501,3 +501,14 @@ run_safe_xmlstarlet()
     echo $(xmlstarlet sel -t -v "yazgfs/config/$myexpr" /etc/koha/sites/$instancename/koha-conf.xml)
     return 0
 }
+
+get_es_indexer_batch_size()
+{
+    local instancename=$1
+    local retval=$(xmlstarlet sel -t -v 'yazgfs/config/es_indexer_batch_size' /etc/koha/sites/$instancename/koha-conf.xml)
+    if [ "$retval" != "" ]; then
+        echo "$retval"
+    else
+        echo "10"
+    fi
+}
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 0e07af36d8..36f632fdb9 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -372,6 +372,9 @@ __END_SRU_PUBLICSERVER__
       Resetting mappings will override any changes made in the Search engine configuration UI.
  -->
  <!-- <elasticsearch_index_mappings>__KOHA_CONF_DIR__/searchengine/elasticsearch/mappings.yaml</elasticsearch_index_mappings> -->
+ <!-- How many indexing tasks the ES indexer will pick at a time
+      If the site is so busy the queue keeps growing, raise it -->
+ <es_indexer_batch_size>10</es_indexer_batch_size>
 
  <interlibrary_loans>
      <!-- Path to where Illbackends are located on the system
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index cd58487213..5c8bab6d67 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -191,6 +191,9 @@
       Resetting mappings will override any changes made in the Search engine configuration UI.
  -->
  <!-- <elasticsearch_index_mappings>__KOHA_CONF_DIR__/searchengine/elasticsearch/mappings.yaml</elasticsearch_index_mappings> -->
+ <!-- How many indexing tasks the ES indexer will pick at a time
+      If the site is so busy the queue keeps growing, raise it -->
+ <es_indexer_batch_size>10</es_indexer_batch_size>
 
  <interlibrary_loans>
      <!-- Path to where Illbackends are located on the system