diff --git a/src-electron/generator/matter/app/zap-templates/common/ClustersHelper.js b/src-electron/generator/matter/app/zap-templates/common/ClustersHelper.js
index 0742d09476..5222b548eb 100644
--- a/src-electron/generator/matter/app/zap-templates/common/ClustersHelper.js
+++ b/src-electron/generator/matter/app/zap-templates/common/ClustersHelper.js
@@ -591,8 +591,9 @@ function enhancedCommands(commands, types) {
       // The 'response' property contains the response returned by the `selectCommandById`
       // helper. But this one does not contains all the metadata informations added by
       // `enhancedItem`, so instead of using the one from ZAP, retrieve the enhanced version.
+      const clusterName = command.clusterName;
       command.response = commands.find(
-        (command) => command.name == responseName
+        (command) => command.name == responseName && command.clusterName == clusterName
       );
       // We might have failed to find a response if our configuration is weird
       // in some way.