diff --git a/package.json b/package.json
index d27dd3a8f3ccaafbee689f5648f45262bbf1501b..1c7b279bede8755ad1cf8ce96d7d3e77ee892e53 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "zap",
-  "version": "2022.4.28",
+  "version": "2022.5.5",
   "description": "Configuration tool for the Zigbee Cluster Library",
   "productName": "zap",
   "cordovaId": "",
diff --git a/src-electron/db/query-endpoint.js b/src-electron/db/query-endpoint.js
index 38b264a8ddd22175e02139bc912cb3abcac45322..139938426413e14966e78bc69a919c13659c9df0 100644
--- a/src-electron/db/query-endpoint.js
+++ b/src-electron/db/query-endpoint.js
@@ -214,6 +214,9 @@ SELECT
   C.IS_OPTIONAL,
   C.MUST_USE_TIMED_INVOKE,
   C.RESPONSE_NAME,
+  RC.MANUFACTURER_CODE as RESPONSE_MANUFACTURER_CODE,
+  RC.CODE AS RESPONSE_CODE,
+  C.RESPONSE_REF,
   EC.INCOMING,
   EC.OUTGOING
 FROM
@@ -222,6 +225,10 @@ LEFT JOIN
   ENDPOINT_TYPE_COMMAND AS EC
 ON
   C.COMMAND_ID = EC.COMMAND_REF
+LEFT JOIN
+  COMMAND AS RC
+ON
+  RC.COMMAND_ID = C.RESPONSE_REF
 WHERE
   C.CLUSTER_REF = ?
   AND EC.ENDPOINT_TYPE_REF = ?
@@ -242,6 +249,9 @@ ORDER BY C.CODE
       isIncoming: row['INCOMING'],
       isOutgoing: row['OUTGOING'],
       responseName: row['RESPONSE_NAME'],
+      responseManufacturerCode: row['RESPONSE_MANUFACTURER_CODE'],
+      responseCode: row['RESPONSE_CODE'],
+      responseRef: row['RESPONSE_REF'],
       hexCode: '0x' + bin.int8ToHex(row['CODE']),
     }
   })
diff --git a/src-electron/generator/helper-endpointconfig.js b/src-electron/generator/helper-endpointconfig.js
index e15477bb90436b7f281c41e333146883f706ef6f..ac668455e0bc44a26fec2243a1841e548b9ffbb5 100644
--- a/src-electron/generator/helper-endpointconfig.js
+++ b/src-electron/generator/helper-endpointconfig.js
@@ -789,6 +789,10 @@ async function collectAttributes(endpointTypes, options) {
           name: cmd.name,
           comment: cluster.comment,
           responseName: cmd.responseName,
+          responseId:
+            cmd.responseRef !== null
+              ? asMEI(cmd.responseManufacturerCode, cmd.responseCode)
+              : null,
         }
         commandList.push(command)
         cluster.commands.push(command)