diff --git a/openair2/ENB_APP/enb_app.c b/openair2/ENB_APP/enb_app.c
index 37bcd36653..35871b15d2 100644
--- a/openair2/ENB_APP/enb_app.c
+++ b/openair2/ENB_APP/enb_app.c
@@ -43,10 +43,14 @@
 #   include "s1ap_eNB.h"
 #   include "sctp_eNB_task.h"
 #   include "gtpv1u_eNB_task.h"
-# else
-#    define EPC_MODE_ENABLED 0
-# endif
-
+/* temporary warning removale while implementing noS1 */
+/* as config option                                   */
+#   else
+#     ifdef EPC_MODE_ENABLED
+#       undef  EPC_MODE_ENABLED
+#     endif
+#     define EPC_MODE_ENABLED 0
+#   endif
 #   include "x2ap_eNB.h"
 #   include "x2ap_messages_types.h"
 #   define X2AP_ENB_REGISTER_RETRY_DELAY   10
diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index e8c52f72f5..6f269b93cb 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -85,8 +85,13 @@
 #   else
 #      include "../../S1AP/s1ap_eNB.h"
 #   endif
+/* temporary warning removale while implementing noS1 */
+/* as config option                                   */
 #else
-# define EPC_MODE_ENABLED 0
+#   ifdef EPC_MODE_ENABLED
+#      undef  EPC_MODE_ENABLED
+#   endif
+#   define EPC_MODE_ENABLED 0
 #endif
 
 #include "pdcp.h"
diff --git a/targets/COMMON/create_tasks.c b/targets/COMMON/create_tasks.c
index 047d8b4037..2c27cc29e8 100644
--- a/targets/COMMON/create_tasks.c
+++ b/targets/COMMON/create_tasks.c
@@ -33,7 +33,12 @@
 #     include "nas_ue_task.h"
 #     include "udp_eNB_task.h"
 #     include "gtpv1u_eNB_task.h"
+/* temporary warning removale while implementing noS1 */
+/* as config option                                   */
 #   else
+#     ifdef EPC_MODE_ENABLED
+#       undef  EPC_MODE_ENABLED
+#     endif
 #     define EPC_MODE_ENABLED 0
 #   endif
 #   if ENABLE_RAL