diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_0_constants.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_0_constants.ino
index 85090cfda..d7d090272 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_0_constants.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_0_constants.ino
@@ -35,14 +35,12 @@ typedef uint16_t Z_ShortAddress;
 const uint16_t BAD_SHORTADDR = 0xFFFE;
 
 #ifdef USE_ZIGBEE_ZNP
-enum ZnpCommandType {
+enum ZnpCommandType : uint8_t {
   Z_POLL = 0x00,
   Z_SREQ = 0x20,
   Z_AREQ = 0x40,
-  Z_SRSP = 0x60
-};
+  Z_SRSP = 0x60,
 
-enum ZnpSubsystem {
   Z_RPC_Error = 0x00,
   Z_SYS = 0x01,
   Z_MAC = 0x02,