diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 2cbd47865..a166cce4a 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -1523,14 +1523,16 @@ ZWave_Parse($$@)
       next;
     }
 
+    my $matched = 0;
     foreach my $k (keys %{$ptr}) {
       if($arg =~ m/^$k/) {
         my $val = $ptr->{$k};
         $val = eval $val if(index($val, '$') >= 0);
         push @event, $val if(defined($val));
+        $matched++;
       }
     }
-    push @event, "UNPARSED:$className $arg" if(!@event);
+    push @event, "UNPARSED:$className $arg" if(!$matched);
   }
 
   my $wu = $baseHash->{WakeUp};