diff --git a/openair-cn/NAS/EURECOM-NAS/src/emm/LowerLayer.c b/openair-cn/NAS/EURECOM-NAS/src/emm/LowerLayer.c
index 1da179903c9773194c2e2b800d7ee32e4c137491..49042cea1c6d5f67dc1a1aabb2c6afc801383cf6 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/emm/LowerLayer.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/emm/LowerLayer.c
@@ -210,7 +210,7 @@ int lowerlayer_data_ind(unsigned int ueid, const OctetString *data)
 
     LOG_FUNC_IN;
 
-#if defined(NAS_MME)
+#if defined(EPC_BUILD) && defined(NAS_MME)
     if (ueid > 0) {
         emm_ctx = emm_data_context_get(&_emm_data, ueid);
     }
diff --git a/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr.c b/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr.c
index b4ef3ba503e8e17736fa63bfb30d9f897aa388a4..5e1efefb64a409593f39101f4f49a0e3acf7f330 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr.c
@@ -177,9 +177,7 @@ int esm_ebr_assign(emm_data_context_t *ctx, int ebi)
 {
     esm_ebr_context_t *ebr_ctx;
 
-#ifdef NAS_UE
     unsigned int ueid = 0;
-#endif
 
     int i;
 
diff --git a/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c b/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c
index bd77766070f103c9c4a93ed624c1301b3ca73761..78be8e035f87b32f1fb92574a002142dd44525a3 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr_context.c
@@ -88,6 +88,8 @@ int esm_ebr_context_create(
     esm_data_context_t *esm_ctx;
     esm_pdn_t *pdn = NULL;
 
+    unsigned int ueid = 0;
+
     LOG_FUNC_IN;
 
 #ifdef NAS_UE
@@ -227,6 +229,8 @@ int esm_ebr_context_release(
     esm_pdn_t *pdn = NULL;
     esm_data_context_t *esm_ctx;
 
+    unsigned int ueid = 0;
+
     LOG_FUNC_IN;
 
 #ifdef NAS_UE