diff --git a/openair-cn/S1AP/s1ap_eNB_nas_procedures.c b/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
index bd0819c1f8673f7cbb9535e375aa77e26c13c8c6..4521148984c0aeeb6a3e29445c0b2f1ac8f275df 100644
--- a/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
+++ b/openair-cn/S1AP/s1ap_eNB_nas_procedures.c
@@ -224,8 +224,12 @@ int s1ap_eNB_handle_nas_first_req(
     mme_desc_p->nextstream += 1;
   }
 
-#if defined(S1AP_LIMIT_STREAM_ID_TO_1)
+#if defined(S1AP_LIMIT_STREAM_ID_TO_0)
+  mme_desc_p->nextstream = 0;
+#else
+#  if defined(S1AP_LIMIT_STREAM_ID_TO_1)
   mme_desc_p->nextstream = 1;
+#  endif
 #endif
   ue_desc_p->stream = mme_desc_p->nextstream;