diff --git a/data/hooks/conf_regen/28-rmilter b/data/hooks/conf_regen/28-rmilter
index 0b6b93a38..cf7c79901 100644
--- a/data/hooks/conf_regen/28-rmilter
+++ b/data/hooks/conf_regen/28-rmilter
@@ -37,7 +37,8 @@ for domain in $domain_list; do
     sudo chmod 400      /etc/dkim/$domain.mail.key
 done
 
-# Reload systemd daemon and stop rmilter service to take into account the
-# new configuration. It will be started again by the socket as needed.
+# Reload systemd daemon, ensure that the socket is listening and stop
+# the service. It will be started again by the socket as needed.
 sudo systemctl daemon-reload
+sudo systemctl start rmilter.socket
 sudo systemctl stop rmilter.service 2>&1 || true
diff --git a/data/hooks/conf_regen/31-rspamd b/data/hooks/conf_regen/31-rspamd
index 4c1520062..a48d8145e 100644
--- a/data/hooks/conf_regen/31-rspamd
+++ b/data/hooks/conf_regen/31-rspamd
@@ -24,5 +24,8 @@ sudo sievec /etc/dovecot/global_script/rspamd.sieve
 sudo chmod 660 /etc/dovecot/global_script/rspamd.svbin
 sudo chown -R vmail:mail /etc/dovecot/global_script
 
-sudo systemctl restart rspamd.socket
+# Ensure that the socket is listening and stop the service.
+sudo systemctl start rspamd.socket
+sudo systemctl stop rspamd.service 2>&1 || true
+
 sudo systemctl restart dovecot