diff --git a/src/app/zap-templates/common/ClusterTestGeneration.js b/src/app/zap-templates/common/ClusterTestGeneration.js
index 2b67190434656c..21b15f94dcffad 100644
--- a/src/app/zap-templates/common/ClusterTestGeneration.js
+++ b/src/app/zap-templates/common/ClusterTestGeneration.js
@@ -174,6 +174,13 @@ function setDefaultTypeForCommand(test)
     break;
   }
 
+  // Sanity Check for GroupId usage
+  // Only two types of actions can be send to Group : Write attribute, and Commands
+  // Spec : Action 8.2.4
+  if ((kGroupId in test) && !test.isGroupCommand) {
+    printErrorAndExit(this, 'Wrong Yaml configuration. Action : ' + test.commandName + " can't be sent to group " + test[kGroupId]);
+  }
+
   test.isWait = false;
 }