diff --git a/src/freedombone-utils-watchdog b/src/freedombone-utils-watchdog
index 7f22caf2284e86a77a6f22230bf8883a827f9bc6..5b0e8f8b9a531c8b8f2eb41f5d2a5e97c24c5b46 100755
--- a/src/freedombone-utils-watchdog
+++ b/src/freedombone-utils-watchdog
@@ -54,7 +54,7 @@ function add_watchdog_daemon {
 
     echo '' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
     echo "# keep ${daemon_name} daemon running" >> /usr/bin/$WATCHDOG_SCRIPT_NAME
-    echo "RUNNING=\$(pgrep ${daemon_name} > /dev/null && echo Running)" >> /usr/bin/$WATCHDOG_SCRIPT_NAME
+    echo "RUNNING=\$(systemctl is-active ${daemon_name} >/dev/null 2>&1 && echo Running)" >> /usr/bin/$WATCHDOG_SCRIPT_NAME
     echo 'if [ ! $RUNNING ]; then' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
     echo "  systemctl start ${daemon_name}" >> /usr/bin/$WATCHDOG_SCRIPT_NAME
     echo '  echo -n $CURRENT_DATE >> $LOGFILE' >> /usr/bin/$WATCHDOG_SCRIPT_NAME