diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index 8c3e7873e4..283ea422ab 100644
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -201,7 +201,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound")
   
 %(DEFAULT_BODY)s
 
-  if (parameter_tvb)
+  if ((parameter_tvb)&&(nas_eps_handle))
     call_dissector(nas_eps_handle,parameter_tvb,%(ACTX)s->pinfo, proto_tree_get_root(tree));
 
 #.TYPE_ATTR
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 0ef9853186..1a2bc98f99 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -2096,7 +2096,7 @@ dissect_s1ap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
                                        NO_BOUND, NO_BOUND, FALSE, &parameter_tvb);
 
 
-  if (parameter_tvb)
+  if ((parameter_tvb)&&(nas_eps_handle))
     call_dissector(nas_eps_handle,parameter_tvb,actx->pinfo, proto_tree_get_root(tree));