diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in
index 1a43d1744..0772568ff 100644
--- a/data/NetworkManager-wait-online.service.in
+++ b/data/NetworkManager-wait-online.service.in
@@ -1,12 +1,12 @@
 [Unit]
 Description=Network Manager Wait Online
-Requires=NetworkManager.service
+After=NetworkManager.service
 Wants=network.target
 Before=network.target
 
 [Service]
 Type=oneshot
-ExecStart=@bindir@/nm-online -q --timeout=30
+ExecStart=@bindir@/nm-online -q -x --timeout=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=network.target