diff --git a/clients/cloud-setup/90-nm-cloud-setup.sh b/clients/cloud-setup/90-nm-cloud-setup.sh
index 9fb2a31da6..817e255581 100755
--- a/clients/cloud-setup/90-nm-cloud-setup.sh
+++ b/clients/cloud-setup/90-nm-cloud-setup.sh
@@ -2,6 +2,8 @@
 
 case "$2" in
     up|dhcp4-change)
-        exec systemctl --no-block restart nm-cloud-setup.service
+        if systemctl -q is-enabled nm-cloud-setup.service ; then
+            exec systemctl --no-block restart nm-cloud-setup.service
+        fi
         ;;
 esac
diff --git a/clients/cloud-setup/nm-cloud-setup.service.in b/clients/cloud-setup/nm-cloud-setup.service.in
index d81abea2af..6a6485b8cf 100644
--- a/clients/cloud-setup/nm-cloud-setup.service.in
+++ b/clients/cloud-setup/nm-cloud-setup.service.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=Automatically configure NetworkManager in cloud
+After=NetworkManager.service
 
 [Service]
 Type=oneshot
@@ -25,3 +26,6 @@ RestrictNamespaces=yes
 RestrictRealtime=yes
 RestrictSUIDSGID=yes
 SystemCallFilter=@system-service
+
+[Install]
+WantedBy=NetworkManager.service