diff --git a/FHEM/10_FS20.pm b/FHEM/10_FS20.pm
index 6bccef4b6..7dc8e7f6f 100755
--- a/FHEM/10_FS20.pm
+++ b/FHEM/10_FS20.pm
@@ -249,6 +249,8 @@ FS20_Set($@)
     $lh->{STATE} = $v;
     $lh->{READINGS}{state}{TIME} = $tn;
     $lh->{READINGS}{state}{VAL} = $v;
+    my $lhname = $lh->{NAME};
+    DoTrigger($lhname, undef) if($name ne $lhname);
   }
   return $ret;
 }
diff --git a/fhem.pl b/fhem.pl
index 1af4c47dc..0804be48b 100755
--- a/fhem.pl
+++ b/fhem.pl
@@ -1139,7 +1139,8 @@ DoSet(@)
   return $ret if($ret);
 
   shift @a;
-  return DoTrigger($dev, join(" ", @a));
+  my $arg = $defs{$dev}{CHANGED} ? undef : join(" ", @a);
+  return DoTrigger($dev, $arg);
 }