diff --git a/fhem/FHEM/10_MQTT2_DEVICE.pm b/fhem/FHEM/10_MQTT2_DEVICE.pm
index 76cd8c12b..bbaaeaead 100644
--- a/fhem/FHEM/10_MQTT2_DEVICE.pm
+++ b/fhem/FHEM/10_MQTT2_DEVICE.pm
@@ -181,7 +181,8 @@ MQTT2_DEVICE_Parse($$)
     }, undef);
 
     my $cidArr = $modules{MQTT2_DEVICE}{defptr}{cid}{$newCid};
-    return "UNDEFINED MQTT2_$newCid MQTT2_DEVICE $newCid" if(!$cidArr);
+    return "UNDEFINED MQTT2_$newCid MQTT2_DEVICE $newCid"
+        if(!$cidArr || !int(@{$cidArr}));
     return "";
   }
 
diff --git a/fhem/FHEM/lib/AttrTemplate/mqtt2.template b/fhem/FHEM/lib/AttrTemplate/mqtt2.template
index 2d3a9af0e..ad4b22f01 100644
--- a/fhem/FHEM/lib/AttrTemplate/mqtt2.template
+++ b/fhem/FHEM/lib/AttrTemplate/mqtt2.template
@@ -67,6 +67,14 @@ filter:TYPE=MQTT2_DEVICE
 attr DEVICE stateFormat T: temperature_weather B: illuminance L: linkquality
 attr DEVICE userReadings temperature_weather { sprintf("%.1f",ReadingsVal("DEVICE","temperature","")+2.5) }
 
+name:zigbee2mqtt_smart+plug
+filter:TYPE=MQTT2_DEVICE
+par:NAMEINTHEBRIDGE;name of this device in the bridge;{ AttrVal("DEVICE","readingList","") =~ m,zigbee2mqtt/(.*):, ? $1 : undef }
+attr DEVICE eventMap { dev=>{ON=>'on',OFF=>'off'} }
+attr DEVICE setList \
+  off zigbee2mqtt/NAMEINTHEBRIDGE/set OFF\
+  on zigbee2mqtt/NAMEINTHEBRIDGE/set ON
+
 
 ###########################################
 # TASMOTA