diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index bc5055d951..c5c4533317 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -15,9 +15,10 @@ mail_plugins =  $mail_plugins fts fts_lucene
 plugin {
   fts = lucene
 
+{% if DISABLE_FTS_AUTOINDEX != 'true' %}
   fts_autoindex = yes
   fts_autoindex_exclude = \Junk
-
+{% endif %}
   fts_lucene = whitespace_chars=@.
 }
 
diff --git a/docs/compose/.env b/docs/compose/.env
index 73964e3a47..99f7ded4af 100644
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -3,6 +3,11 @@
 # these few settings must however be configured before starting the mail
 # server and require a restart upon change.
 
+# Set to "true" to disable full text search auto indexer. (Values: true, false)
+# This defers imap indexing to happen only during searching
+# Workaround for bug in issue #751: indexer-worker crashes and corrupts index files
+DISABLE_FTS_AUTOINDEX=false
+
 ###################################
 # Common configuration variables
 ###################################