diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2619dc65..d46b35c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file. The format
 
 > **Note**: Changes and additions listed here are contained in the `:edge` image tag. These changes may not be as stable as released changes.
 
+### Fixed
+
+- **scripts**: Run `user-patches.sh` right before starting daemons ([#2817](https://github.com/docker-mailserver/docker-mailserver/pull/2817))
+
 ## [11.2.0](https://github.com/docker-mailserver/docker-mailserver/releases/tag/v11.2.0)
 
 ### Summary
@@ -92,7 +96,7 @@ In this release the relay-host support saw [significant internal refactoring](ht
 - **Platform Support - ARMv7**
   This is a very old platform, superceded by ARMv8 and newer with broad product availability around 2016 onwards.
   Support was introduced primarily for users the older generations of Raspberry Pi. ARM64 is the modern target for ARM devices.
-  
+
   If you require ARMv7 support, [please let us know](https://github.com/docker-mailserver/docker-mailserver/issues/2642).
 
 ## `v11.0.0`
@@ -204,7 +208,7 @@ In this release the relay-host support saw [significant internal refactoring](ht
 
 ## `v10.4.0`
 
-This release upgrades our base image from Debian 10 to Debian 11.  
+This release upgrades our base image from Debian 10 to Debian 11.
 There is also an important regression fixed for `SSL_TYPE=letsencrypt` users.
 
 - **[fix]** A regression with `check-for-changes.sh` introduced in `v10.3.0` affected `SSL_TYPE=letsencrypt`, preventing detection of cert renewals to restart services (_unless using `acme.json`_) [#2326](https://github.com/docker-mailserver/docker-mailserver/pull/2326)
diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh
index 95bcaefb..d8068c1e 100755
--- a/target/scripts/start-mailserver.sh
+++ b/target/scripts/start-mailserver.sh
@@ -143,7 +143,6 @@ function _register_functions
   _register_setup_function '_setup_logrotate'
   _register_setup_function '_setup_mail_summary'
   _register_setup_function '_setup_logwatch'
-  _register_setup_function '_setup_user_patches'
 
   # ? >> Fixes
 
@@ -228,6 +227,7 @@ _setup
 [[ ${LOG_LEVEL} =~ (debug|trace) ]] && print-environment
 _apply_fixes
 _start_misc
+_setup_user_patches
 _start_daemons
 
 # marker to check if container was restarted