diff --git a/data/settings.js b/data/settings.js
index 2488a26e2..032a55306 100644
--- a/data/settings.js
+++ b/data/settings.js
@@ -813,6 +813,12 @@ If set to \`0\`, no limit on the total number of actions is enforced.`
 		tags: [ 'sieve' ],
 		plugin: 'sieve',
 		default: '30s',
+		changed: {
+			settings_sieve_max_cpu_time_changed: `
+Changed from \`0\` (unlimited) to \`30s\`. Previously, \`30s\` was the default
+only for the \`sieve_env_location_ms\` (IMAP) filter; it now applies globally
+including MDA execution.`
+		},
 		values: setting_types.TIME,
 		text: `
 The maximum amount of CPU time that a Sieve script is allowed to use while
diff --git a/data/updates.js b/data/updates.js
index a4b0ca604..1d76797b8 100644
--- a/data/updates.js
+++ b/data/updates.js
@@ -170,6 +170,7 @@ export const updates = {
 	settings_passdb_mechanisms_filter_added: '2.4.0',
 	settings_passdb_static_password_added: '2.4.0',
 	settings_service_reuse_port_added: '2.4.4',
+	settings_sieve_max_cpu_time_changed: '2.4.5',
 	settings_ssl_client_ca_added: '2.4.0',
 	settings_ssl_imapc_removed: '2.4.0',
 	settings_ssl_request_client_cert_changed: '2.4.0',
diff --git a/docs/installation/upgrade/2.4-to-2.4.x.md b/docs/installation/upgrade/2.4-to-2.4.x.md
index 8e137061f..30e4d6da4 100644
--- a/docs/installation/upgrade/2.4-to-2.4.x.md
+++ b/docs/installation/upgrade/2.4-to-2.4.x.md
@@ -115,3 +115,14 @@ changed to `2.4.4`.
 | `push_notification_ox/http_client_request_max_attempts` | `1` | `2` |
 | `push_notification_ox/http_client_request_timeout` | `1min` | `2s` |
 | `service/lmtp/service_extra_groups` | | [[setting,default_internal_group]] |
+
+### v2.4.4 to v2.4.5
+
+#### Changed Setting Defaults
+
+These changes don't take effect until [[setting,dovecot_config_version]] is
+changed to `2.4.5`.
+
+| Setting | Old Default Value | New Default Value |
+| ------- | ----------------- | ----------------- |
+| [[setting,sieve_max_cpu_time]] | `0` (unlimited) | `30s` |