diff --git a/openair2/COMMON/ngap_messages_types.h b/openair2/COMMON/ngap_messages_types.h
index 0f1555cfdf..cdba1c5e2d 100644
--- a/openair2/COMMON/ngap_messages_types.h
+++ b/openair2/COMMON/ngap_messages_types.h
@@ -32,11 +32,9 @@
 #include "common/platform_constants.h"
 #include "common/platform_types.h"
 #include "common/5g_platform_types.h"
-#include "LTE_asn_constant.h"
 #include "s1ap_messages_types.h"
-//-------------------------------------------------------------------------------------------//
-// Defines to access message fields.
 
+// Defines to access message fields.
 #define NGAP_REGISTER_GNB_REQ(mSGpTR)           (mSGpTR)->ittiMsg.ngap_register_gnb_req
 
 #define NGAP_REGISTER_GNB_CNF(mSGpTR)           (mSGpTR)->ittiMsg.ngap_register_gnb_cnf
@@ -72,10 +70,9 @@
 #define NGAP_PDUSESSION_RELEASE_RESPONSE(mSGpTR)     (mSGpTR)->ittiMsg.ngap_pdusession_release_resp
 
 //-------------------------------------------------------------------------------------------//
-/* Maximum number of e-rabs to be setup/deleted in a single message.
- * Even if only one bearer will be modified by message.
- */
-#define NGAP_MAX_PDUSESSION  (LTE_maxDRB + 3)
+
+// maxnoofPDUSessions in 3GPP TS 38.413
+#define NGAP_MAX_PDUSESSION 16 // 256 according to specs
 
 /* Length of the transport layer address string
  * 160 bits / 8 bits by char.