diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1f0d57bd..89398a06c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
 - Interaction of ``SetOption92``, ``VirtualCT``, and ``RGBWWTable`` (#18768)
 - Fixed HASPmota event when value is non-integer (fixes #18229)
 - Matter fix local Occupancy sensor
+- Zigbee fixed regression with SetOption101
 
 ### Removed
 
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_6_0_commands.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_6_0_commands.ino
index 3183db08a..aa30eb15d 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_6_0_commands.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_6_0_commands.ino
@@ -509,18 +509,10 @@ void convertClusterSpecific(class Z_attribute_list &attr_list, uint16_t cluster,
         break;
       }
     } else {  // general case
-      // do we send command with endpoint suffix
-      char command_suffix[4] = { 0x00 };  // empty string by default
-      // if SO101 and multiple endpoints, append endpoint number
-      if (Settings->flag4.zb_index_ep) {
-        if (zigbee_devices.getShortAddr(shortaddr).countEndpoints() > 0) {
-          snprintf_P(command_suffix, sizeof(command_suffix), PSTR("%d"), srcendpoint);
-        }
-      }
       if (0 == xyz.x_type) {
-        attr_list.addAttribute(command_name, command_suffix).setBool(true);
+        attr_list.addAttribute(command_name).setBool(true);
       } else if (0 == xyz.y_type) {
-        attr_list.addAttribute(command_name, command_suffix).setUInt(xyz.x);
+        attr_list.addAttribute(command_name).setUInt(xyz.x);
       } else {
         // multiple answers, create an array
         JsonGeneratorArray arr;
@@ -529,7 +521,7 @@ void convertClusterSpecific(class Z_attribute_list &attr_list, uint16_t cluster,
         if (xyz.z_type) {
           arr.add(xyz.z);
         }
-        attr_list.addAttribute(command_name, command_suffix).setStrRaw(arr.toString().c_str());
+        attr_list.addAttribute(command_name).setStrRaw(arr.toString().c_str());
       }
     }
   }