diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 74df9bb3e..a0baddd77 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -611,7 +611,10 @@ ZWave_Parse($$@)
     if($hash && $hash->{WakeUp} && @{$hash->{WakeUp}}) { # Always the base hash
       IOWrite($hash, "00", shift @{$hash->{WakeUp}});
     }
-    readingsSingleUpdate($hash, "CMD", $cmd, 1); # forum:20884
+    if(!$ret) {
+      readingsSingleUpdate($hash, "CMD", $cmd, 1); # forum:20884
+      return $hash->{NAME};
+    }
     return $ret;
 
   } elsif($cmd eq "ZW_SEND_DATA") {