diff --git a/src/hss/hss-context.c b/src/hss/hss-context.c
index b024d357b..a04cb6f38 100644
--- a/src/hss/hss-context.c
+++ b/src/hss/hss-context.c
@@ -1199,7 +1199,7 @@ int hss_handle_change_event(const bson_t *document)
     bool send_idr_flag = false;
     uint32_t subdatamask = 0;
 
-    char *imsi_bcd;
+    char *imsi_bcd = NULL;
 
 #if BSON_MAJOR_VERSION >= 1 && BSON_MINOR_VERSION >= 7
     char *as_json = bson_as_relaxed_extended_json(document, NULL);
diff --git a/src/mme/mme-context.c b/src/mme/mme-context.c
index 5fbda8b94..38a7a3201 100644
--- a/src/mme/mme-context.c
+++ b/src/mme/mme-context.c
@@ -1649,7 +1649,7 @@ int mme_context_parse_config(void)
                         ogs_yaml_iter_recurse(&sgsn_iter, &routes_array);
                         do {
                             ogs_nas_rai_t rai;
-                            uint16_t cell_id;
+                            uint16_t cell_id = 0;
                             bool rai_parsed = false, cell_id_parsed = false;
                             bool default_route = false;
                             mme_sgsn_route_t *sgsn_rt = NULL;