diff --git a/openair-cn/S1AP/s1ap_eNB_context_management_procedures.c b/openair-cn/S1AP/s1ap_eNB_context_management_procedures.c
index 9362417aa20cb8b5520f996db4dd90edc95fb6dd..bdf6d9b8be11d81d545c336f4cf67fbe58d9f8d0 100755
--- a/openair-cn/S1AP/s1ap_eNB_context_management_procedures.c
+++ b/openair-cn/S1AP/s1ap_eNB_context_management_procedures.c
@@ -105,8 +105,8 @@ int s1ap_ue_context_release_complete(instance_t instance,
                                      length, ue_context_p->stream);
 
 
-    s1ap_eNB_itti_send_sctp_close_association(s1ap_eNB_instance_p->instance,
-                                     ue_context_p->mme_ref->assoc_id);
+    //LG s1ap_eNB_itti_send_sctp_close_association(s1ap_eNB_instance_p->instance,
+    //                                 ue_context_p->mme_ref->assoc_id);
 
 
 
diff --git a/openair-cn/S1AP/s1ap_eNB_nas_procedures.c b/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
index bd4f67ccff1a5f1f97a338cd8ea1cfbf082ac036..8e7f8d3dc1a110188011accc1d0982462a3c89b6 100644
--- a/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
+++ b/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
@@ -202,9 +202,23 @@ int s1ap_eNB_handle_nas_first_req(
     /* Update the current S1AP UE state */
     ue_desc_p->ue_state = S1AP_UE_WAITING_CSR;
 
-    /* Assign a stream for this UE */
-    mme_desc_p->nextstream %= mme_desc_p->out_streams;
-    ue_desc_p->stream = ++mme_desc_p->nextstream;
+    /* Assign a stream for this UE :
+     * From 3GPP 36.412 7)Transport layers:
+     *  Within the SCTP association established between one MME and eNB pair:
+     *  - a single pair of stream identifiers shall be reserved for the sole use
+     *      of S1AP elementary procedures that utilize non UE-associated signalling.
+     *  - At least one pair of stream identifiers shall be reserved for the sole use
+     *      of S1AP elementary procedures that utilize UE-associated signallings.
+     *      However a few pairs (i.e. more than one) should be reserved.
+     *  - A single UE-associated signalling shall use one SCTP stream and
+     *      the stream should not be changed during the communication of the
+     *      UE-associated signalling.
+     */
+    mme_desc_p->nextstream = (mme_desc_p->nextstream + 1) % mme_desc_p->out_streams;
+    if ((mme_desc_p->nextstream == 0) && (mme_desc_p->out_streams > 1)) {
+        mme_desc_p->nextstream += 1;
+    }
+    ue_desc_p->stream = mme_desc_p->nextstream;
 
     /* Send encoded message over sctp */
     s1ap_eNB_itti_send_sctp_data_req(instance_p->instance, mme_desc_p->assoc_id,