diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 4af390f1aeb390..2e5c502b4ed72a 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -301,14 +301,8 @@
             "LocalTime"
         ],
         "Temperature Control": ["SupportedTemperatureLevels"],
-        "Operational State": [
-            "OperationalState",
-            "OperationalError"
-        ],
-        "RVC Operational State": [
-            "OperationalState",
-            "OperationalError"
-        ]
+        "Operational State": ["OperationalState", "OperationalError"],
+        "RVC Operational State": ["OperationalState", "OperationalError"]
     },
     "defaultReportingPolicy": "mandatory",
     "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 6633afca1c340d..c7459b16080edc 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -299,14 +299,8 @@
             "LocalTime"
         ],
         "Temperature Control": ["SupportedTemperatureLevels"],
-        "Operational State": [
-            "OperationalState",
-            "OperationalError"
-        ],
-        "RVC Operational State": [
-            "OperationalState",
-            "OperationalError"
-        ]
+        "Operational State": ["OperationalState", "OperationalError"],
+        "RVC Operational State": ["OperationalState", "OperationalError"]
     },
     "defaultReportingPolicy": "mandatory",
     "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],