diff --git a/data/hooks/conf_regen/37-mdns b/data/hooks/conf_regen/37-mdns
index fa1ccbd09..52213c297 100755
--- a/data/hooks/conf_regen/37-mdns
+++ b/data/hooks/conf_regen/37-mdns
@@ -42,10 +42,11 @@ do_post_regen() {
         systemctl daemon-reload
     fi
 
+    systemctl disable avahi-daemon.socket --now 2>&1|| true
+    systemctl disable avahi-daemon --now 2>&1 || true
+
     # Legacy stuff to enable the new yunomdns service on legacy systems
     if [[ -e /etc/avahi/avahi-daemon.conf ]] && grep -q 'yunohost' /etc/avahi/avahi-daemon.conf; then
-        systemctl disable avahi-daemon --now || true
-        sleep 2
         systemctl enable yunomdns --now
         sleep 2
     fi