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 5e1efefb64a409593f39101f4f49a0e3acf7f330..5e183dcc37e7ef71fb207281027346e517d484e1 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/esm/esm_ebr.c
@@ -175,11 +175,9 @@ int esm_ebr_assign(int ebi, int cid, int default_ebr)
 int esm_ebr_assign(emm_data_context_t *ctx, int ebi)
 #endif
 {
-    esm_ebr_context_t *ebr_ctx;
-
-    unsigned int ueid = 0;
-
-    int i;
+    esm_ebr_context_t *ebr_ctx = NULL;
+    unsigned int       ueid    = 0;
+    int                i;
 
     LOG_FUNC_IN;