diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_1z_libs.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_1z_libs.ino
index d81cabe5c..4e67e4673 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_1z_libs.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_1z_libs.ino
@@ -561,7 +561,7 @@ bool Z_attribute::equalsKey(const Z_attribute & attr2, bool ignore_key_suffix) c
 
 bool Z_attribute::equalsId(uint16_t _cluster, uint16_t _attr_id, uint8_t suffix) const {
   if (key_is_cmd || key_is_str) { return false; }
-  if ((this->cluster == _cluster) && (this->attr_id == _attr_id) && (!this->key_is_cmd)) {
+  if ((this->cluster == _cluster) && (this->attr_id == _attr_id)) {
     if (suffix) {
       if (key_suffix == suffix) { return true; }
     } else {
@@ -572,9 +572,9 @@ bool Z_attribute::equalsId(uint16_t _cluster, uint16_t _attr_id, uint8_t suffix)
 }
 
 bool Z_attribute::equalsCmd(uint16_t _cluster, uint8_t _cmd_id, bool _direction, bool cmd_general, uint8_t suffix) const {
-  if (!key_is_cmd ||key_is_str) { return false; }
+  if (!key_is_cmd || key_is_str) { return false; }
   uint16_t _attr_id = _cmd_id | (_direction ? 0x100 : 0x000) | (cmd_general ? 0x200 : 0x000);
-  if ((this->cluster == _cluster) && (this->attr_id == _attr_id) && (!this->key_is_cmd)) {
+  if ((this->cluster == _cluster) && (this->attr_id == _attr_id)) {
     if (suffix) {
       if (key_suffix == suffix) { return true; }
     } else {