diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 8dcd8b599..ab48f5fbe 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2486,7 +2486,8 @@ FW_devState($$)
   my $state = $defs{$d}{STATE};
   $state = "" if(!defined($state));
 
-  $hasOnOff = ($allSets =~ m/\bon\b/ && $allSets =~ m/\boff\b/);
+  $hasOnOff = ($allSets =~ m/(^| )on( |$)/ &&
+               $allSets =~ m/(^| )off( |$)/);
   my $txt = $state;
   if(defined(AttrVal($d, "showtime", undef))) {
     my $v = $defs{$d}{READINGS}{state}{TIME};