diff --git a/fhem/FHEM/00_ZWCUL.pm b/fhem/FHEM/00_ZWCUL.pm
index 330a3ec35..885a358b6 100755
--- a/fhem/FHEM/00_ZWCUL.pm
+++ b/fhem/FHEM/00_ZWCUL.pm
@@ -89,7 +89,7 @@ ZWCUL_Define($$)
           "HomeId:$hash->{homeId} CtrlNodeIdHex:$hash->{nodeIdHex}", TimeNow());
 
   $hash->{Clients} = ":ZWave:STACKABLE:";
-  my %matchList = ( "1:ZWave" => ".*",
+  my %matchList = ( "1:ZWave" => "^[0-9A-Fa-f]+\$",
                     "2:STACKABLE"=>"^\\*" );
   $hash->{MatchList} = \%matchList;
 
diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 3b8c30765..33d84d0eb 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -613,7 +613,7 @@ sub
 ZWave_Initialize($)
 {
   my ($hash) = @_;
-  $hash->{Match}     = ".*";
+  $hash->{Match}     = "^[0-9A-Fa-f]+\$";
   $hash->{SetFn}     = "ZWave_Set";
   $hash->{GetFn}     = "ZWave_Get";
   $hash->{DefFn}     = "ZWave_Define";