diff --git a/data/hooks/conf_regen/22-email-legacy b/data/hooks/conf_regen/22-email-legacy
index e23d2b8b..d17a6dd1 100644
--- a/data/hooks/conf_regen/22-email-legacy
+++ b/data/hooks/conf_regen/22-email-legacy
@@ -27,7 +27,8 @@ if [[ "$1" == "True" ]]; then
     sudo ls /etc/rc2.d/S??amavis > /dev/null 2>&1 \
       || sudo systemctl disable amavis || true
     sudo systemctl is-active amavis > /dev/null  \
-      && { sudo systemctl stop amavis || true ; }
+      && { sudo systemctl stop amavis || true ; } \
+      || true
     sudo yunohost service status amavis > /dev/null 2>&1 \
       && { sudo yunohost service remove amavis || true ; } \
       || true
@@ -36,7 +37,8 @@ if [[ "$1" == "True" ]]; then
     sudo ls /etc/rc2.d/S??postgrey > /dev/null 2>&1 \
       || sudo systemctl disable postgrey || true
     sudo systemctl is-active postgrey > /dev/null  \
-      && { sudo systemctl stop postgrey || true ; }
+      && { sudo systemctl stop postgrey || true ; } \
+      || true
     sudo yunohost service status postgrey > /dev/null 2>&1 \
       && { sudo yunohost service remove postgrey || true ; } \
       || true