diff --git a/fhem/FHEM/00_MQTT2_CLIENT.pm b/fhem/FHEM/00_MQTT2_CLIENT.pm
index 0180e1c23..c1c952f6d 100644
--- a/fhem/FHEM/00_MQTT2_CLIENT.pm
+++ b/fhem/FHEM/00_MQTT2_CLIENT.pm
@@ -20,8 +20,11 @@ MQTT2_CLIENT_Initialize($)
 {
   my ($hash) = @_;
 
-  $hash->{Clients} = ":MQTT2_DEVICE:";
-  $hash->{MatchList}= { "1:MQTT2_DEVICE"  => "^.*" },
+  $hash->{Clients} = ":MQTT2_DEVICE:MQTT_GENERIC_BRIDGE:";
+  $hash->{MatchList}= {
+    "1:MQTT2_DEVICE"  => "^.*",
+    "2:MQTT_GENERIC_BRIDGE" => "^.*"
+  };
   $hash->{ReadFn}  = "MQTT2_CLIENT_Read";
   $hash->{DefFn}   = "MQTT2_CLIENT_Define";
   $hash->{AttrFn}  = "MQTT2_CLIENT_Attr";
diff --git a/fhem/FHEM/00_MQTT2_SERVER.pm b/fhem/FHEM/00_MQTT2_SERVER.pm
index 2de6f7da6..27122e47d 100644
--- a/fhem/FHEM/00_MQTT2_SERVER.pm
+++ b/fhem/FHEM/00_MQTT2_SERVER.pm
@@ -23,8 +23,11 @@ MQTT2_SERVER_Initialize($)
 {
   my ($hash) = @_;
 
-  $hash->{Clients} = ":MQTT2_DEVICE:";
-  $hash->{MatchList}= { "1:MQTT2_DEVICE"  => "^.*" },
+  $hash->{Clients} = ":MQTT2_DEVICE:MQTT_GENERIC_BRIDGE:";
+  $hash->{MatchList}= {
+    "1:MQTT2_DEVICE"  => "^.*",
+    "2:MQTT_GENERIC_BRIDGE" => "^.*"
+  };
   $hash->{ReadFn}  = "MQTT2_SERVER_Read";
   $hash->{DefFn}   = "MQTT2_SERVER_Define";
   $hash->{AttrFn}  = "MQTT2_SERVER_Attr";