diff --git a/FHEM/91_watchdog.pm b/FHEM/91_watchdog.pm
index e36b9f758..2a2127a97 100755
--- a/FHEM/91_watchdog.pm
+++ b/FHEM/91_watchdog.pm
@@ -149,7 +149,7 @@ watchdog_Trigger($)
   my ($watchdog) = @_;
   my $name = $watchdog->{NAME};
 
-  if(AttrVal($name, "disable", 0)) {
+  if(IsDisabled($name) || $watchdog->{STATE} eq "inactive") {
     $watchdog->{STATE} = "defined";
     return "";
   }