diff --git a/wifi-keepalive.py b/wifi-keepalive.py
index 514f4dd..25f7e20 100644
--- a/wifi-keepalive.py
+++ b/wifi-keepalive.py
@@ -3,7 +3,6 @@ from subprocess import CalledProcessError, check_output
 from sys import exit
 from time import sleep
 
-INITIAL_DELAY_IN_SECONDS = 40
 PING_INTERVAL_IN_SECONDS = 80
 
 
@@ -11,7 +10,6 @@ class WifiKeepalive:
 
     def __init__(self):
         self.defaultRoute = None
-        self.initialDelay = INITIAL_DELAY_IN_SECONDS
         self.pingInterval = PING_INTERVAL_IN_SECONDS
         self.isConnected = False
         self.pingCommand = 'ping -c 1 -W 2 -n'
@@ -26,7 +24,6 @@ class WifiKeepalive:
             sleep(self.pingInterval)
 
     def prepare(self):
-        sleep(self.initialDelay)
         self.updateDefaultWifiRoute()
 
         if self.defaultRoute:
diff --git a/wifi-keepalive.service b/wifi-keepalive.service
index d0e66ad..d703117 100644
--- a/wifi-keepalive.service
+++ b/wifi-keepalive.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Wifi Keepalive Service
-After=multi.user.target
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=simple