diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 3158dc4..9873245 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -569,7 +569,7 @@
 runs on RAN_Emulation_CT {
 	/* decode + send decoded RANAP to client */
 	var template (omit) octetstring l3 := f_ranap_extract_l3(ranap);
-	if (istemplatekind(l3, "omit")) {
+	if (istemplatekind(l3, "omit") or not g_ran_ops.decode_dtap) {
 		CLIENT.send(ranap) to client;
 	} else {
 		var template (omit) SAPI sapi := f_ranap_extract_sapi(ranap);