diff --git a/rpi-mqtt-monitor.service b/rpi-mqtt-monitor.service
index 59e5ad1..f9fa1d1 100644
--- a/rpi-mqtt-monitor.service
+++ b/rpi-mqtt-monitor.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=RPI MQTT Monitor
-After=network.target
+After=network-online.target
+Wants=network-online.targetcat 
 
 [Service]
 ExecStart=/home/username/git/rpi-mqtt-monitor/rpi_mon_env/bin/python /home/username/git/rpi-mqtt-monitor/src/rpi-cpu2mqtt.py --service
@@ -8,6 +9,7 @@ WorkingDirectory=/home/username/git/rpi-mqtt-monitor/
 StandardOutput=inherit
 StandardError=inherit
 Restart=always
+RestartSec=1
 User=YOUR_USER
 
 [Install]
diff --git a/src/rpi-cpu2mqtt.py b/src/rpi-cpu2mqtt.py
index 737425d..8a15959 100644
--- a/src/rpi-cpu2mqtt.py
+++ b/src/rpi-cpu2mqtt.py
@@ -362,11 +362,12 @@ def publish_update_status_to_mqtt(git_update):
             client.publish("homeassistant/binary_sensor/" + config.mqtt_topic_prefix + "/" + hostname + "_git_update/config",
                            config_json('git_update'), qos=config.qos)
         client.publish(config.mqtt_topic_prefix + "/" + hostname + "/git_update", git_update, qos=config.qos, retain=config.retain)
-    client.loop_stop()
+    
     if config.update:
         if config.discovery_messages:
             client.publish("homeassistant/update/" + hostname + "/config",
                            config_json('update'), qos=config.qos)
+    client.loop_stop()
     client.disconnect()