diff --git a/ffs-watchdog/files/usr/sbin/ffs-watchdog b/ffs-watchdog/files/usr/sbin/ffs-watchdog
index f1722d307db3499670d29fa0e7e7a7c2b297082d..6fe036602e988a433c8b583dbc99ac0aeb8187b7 100755
--- a/ffs-watchdog/files/usr/sbin/ffs-watchdog
+++ b/ffs-watchdog/files/usr/sbin/ffs-watchdog
@@ -5,7 +5,8 @@ if [ $(ps | grep -c "$ME") -gt 4 ]; then
   exit 1
 fi
 
-if [ "$(uci get gluon-setup-mode.@setup_mode[0].enabled)" = "0" ]; then
+if [ "$(uci get gluon-setup-mode.@setup_mode[0].enabled)" = "0" ] &&
+   [ "$(uci get system.@system[0].enable_watchdog)" != "0" ]; then
   FFS=/tmp/.gw.ffs
   NOW=$(date +%s)
   if [ -n "$(batctl gwl | grep '=>')" ]; then