diff --git a/openair2/F1AP/f1ap_cu_interface_management.c b/openair2/F1AP/f1ap_cu_interface_management.c
index a81b722910d17318ab1558f516e99032085633cd..075bdd6418e37ab535abb02e5c3d61a2b668bcc0 100644
--- a/openair2/F1AP/f1ap_cu_interface_management.c
+++ b/openair2/F1AP/f1ap_cu_interface_management.c
@@ -244,8 +244,9 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
   module_id_t enb_mod_idP;
   module_id_t cu_mod_idP;
 
-  enb_mod_idP = (module_id_t)12;
-  cu_mod_idP  = (module_id_t)34;
+  // This should be fixed
+  enb_mod_idP = (module_id_t)0;
+  cu_mod_idP  = (module_id_t)0;
 
   F1AP_F1AP_PDU_t           pdu;
   F1AP_F1SetupResponse_t    *out;
@@ -378,8 +379,9 @@ int CU_send_F1_SETUP_FAILURE(instance_t instance) {
   module_id_t enb_mod_idP;
   module_id_t cu_mod_idP;
 
-  enb_mod_idP = (module_id_t)12;
-  cu_mod_idP  = (module_id_t)34;
+  // This should be fixed
+  enb_mod_idP = (module_id_t)0;
+  cu_mod_idP  = (module_id_t)0;
 
   F1AP_F1AP_PDU_t           pdu;
   F1AP_F1SetupFailure_t    *out;
diff --git a/openair2/F1AP/f1ap_du_interface_management.c b/openair2/F1AP/f1ap_du_interface_management.c
index 189831c0647977f63d8d7cb462de3387cc7196c1..c3f139296d915716a4c3c4ff7d6eedc952c7ca88 100644
--- a/openair2/F1AP/f1ap_du_interface_management.c
+++ b/openair2/F1AP/f1ap_du_interface_management.c
@@ -85,8 +85,8 @@ int DU_handle_ERROR_INDICATION(instance_t instance,
 
 // SETUP REQUEST
 int DU_send_F1_SETUP_REQUEST(instance_t instance) {
-  module_id_t enb_mod_idP;
-  module_id_t du_mod_idP;
+  module_id_t enb_mod_idP=0;
+  module_id_t du_mod_idP=0;
 
   F1AP_F1AP_PDU_t          pdu; 
   F1AP_F1SetupRequest_t    *out;