diff --git a/data/hooks/conf_regen/31-rspamd b/data/hooks/conf_regen/31-rspamd
index 1aa38562d..57bac110c 100755
--- a/data/hooks/conf_regen/31-rspamd
+++ b/data/hooks/conf_regen/31-rspamd
@@ -14,21 +14,22 @@ do_pre_regen() {
 }
 
 do_post_regen() {
-  regen_conf_files=$1
 
-  [ -z "$regen_conf_files" ] && exit 0
-
-  # retrieve variables
-  domain_list=$(sudo yunohost domain list --output-as plain --quiet)
+  ##
+  ## DKIM key generation
+  ##
 
   # create DKIM directory with proper permission
   sudo mkdir -p /etc/dkim
   sudo chown _rspamd /etc/dkim
 
+  # retrieve domain list
+  domain_list=$(sudo yunohost domain list --output-as plain --quiet)
+
   # create DKIM key for domains
-  for domain in "$domain_list"; do
+  for domain in $domain_list; do
     domain_key="/etc/dkim/${domain}.mail.key"
-    [ ! -f $domain_key ] && {
+    [ ! -f "$domain_key" ] && {
       sudo opendkim-genkey --domain="$domain" \
           --selector=mail --directory=/etc/dkim
       sudo mv /etc/dkim/mail.private "$domain_key"
@@ -40,6 +41,9 @@ do_post_regen() {
   sudo chown _rspamd /etc/dkim/*.mail.key
   sudo chmod 400 /etc/dkim/*.mail.key
 
+  regen_conf_files=$1
+  [ -z "$regen_conf_files" ] && exit 0
+
   # compile sieve script
   [[ "$regen_conf_files" =~ rspamd\.sieve ]] && {
     sudo sievec /etc/dovecot/global_script/rspamd.sieve