diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index 85725fc..63db7fc 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -1678,8 +1678,8 @@
 		    ete_id := ete_id,
 		    avps := superset(
 			tr_AVP_OriginHost(orig_host),
-			tr_AVP_OriginRealm(orig_realm),
-			tr_AVP_OriginStateId(state_id)
+			tr_AVP_OriginRealm(orig_realm)
+			/* tr_AVP_OriginStateId(state_id) is optional */
 	));
 
 /* RFC 6733, section 5.5.2 "Device-Watchdog-Answer" */
@@ -1714,8 +1714,8 @@
 		    avps := superset(
 			tr_AVP_ResultCode(DIAMETER_SUCCESS),
 			tr_AVP_OriginHost(orig_host),
-			tr_AVP_OriginRealm(orig_realm),
-			tr_AVP_OriginStateId(state_id)
+			tr_AVP_OriginRealm(orig_realm)
+			/* tr_AVP_OriginStateId(state_id) is optional */
 	));
 
 function f_DIAMETER_get_avp(PDU_DIAMETER pdu, template (present) AVP_Code avp_code)