diff --git a/data/settings.js b/data/settings.js
index 7b044aed5..7346b0b32 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -1954,10 +1954,10 @@ fts_header_includes {
 		text: ``
 	},
 
-	fts_index_timeout: {
-		default: 0,
+	fts_search_timeout: {
+		default: '30s',
 		plugin: 'fts',
-		values: setting_types.UINT,
+		values: setting_types.TIME,
 		text: `
 When the full text search driver detects that the index isn't up-to-date,
 the indexer is told to index the messages and is given this much time to do
@@ -2295,7 +2295,7 @@ Set to \`0\` to disable rotation.`
 	},
 
 	fts_flatcurve_rotate_time: {
-		default: 5000,
+		default: '5s',
 		values: setting_types.TIME_MSECS,
 		plugin: 'fts-flatcurve',
 		advanced: true,
@@ -8583,7 +8583,7 @@ subscriptions file, unless SUBSCRIBE command is explicitly used for them.`
 	},
 
 	mailbox_autoexpunge: {
-		default: 'no',
+		default: 0,
 		seealso: [ 'mailbox_autoexpunge_max_mails' ],
 		tags: [ 'mailbox' ],
 		values: setting_types.TIME,
diff --git a/docs/installation/upgrade/include/2.4-converted-settings.inc b/docs/installation/upgrade/include/2.4-converted-settings.inc
index 23cde4445..d114e6699 100644
--- a/docs/installation/upgrade/include/2.4-converted-settings.inc
+++ b/docs/installation/upgrade/include/2.4-converted-settings.inc
@@ -31,3 +31,4 @@
 | `quota_over_flag_value` | Renamed to [[setting,quota_over_status_mask]]. |
 | `quota_over_script` | Replaced by [[setting,quota_over_status]] named filter with [[setting,execute]]. |
 | `quota_max_mail_size` | Renamed to [[setting,quota_mail_size]]. The default value is set to `unlimited`. |
+| `fts_index_timeout` | Renamed to [[setting,fts_search_timeout]]. The default value is set to `30 secs`. |