diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
index c3ccfcc829..ea97767574 100644
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -159,13 +159,15 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
 
             ulsch0->f_pusch = pusch_config_pdu->absolute_delta_PUSCH;
 
-            if (scheduled_response->tx_request){
+            if (scheduled_response->tx_request){ // TBR todo here it should loop through the number of tx pdus
               fapi_nr_tx_request_body_t *tx_req_body = scheduled_response->tx_request->tx_request_body;
 
               //harq_process_ul_ue->a = (unsigned char*)calloc(TBS/8, sizeof(unsigned char));
               memcpy(harq_process_ul_ue->a, tx_req_body->pdu, tx_req_body->pdu_length);
 
               harq_process_ul_ue->status = ACTIVE;
+
+              scheduled_response->tx_request->number_of_pdus = 0;
             }
 
           } else {
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_defs.h b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
index 9b1b2835ce..cc9e8a0ae4 100755
--- a/openair2/LAYER2/NR_MAC_UE/mac_defs.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
@@ -247,7 +247,6 @@ typedef struct {
   uint8_t generate_nr_prach;
 
   ////	FAPI-like interface message
-  fapi_nr_tx_request_t tx_request;
   fapi_nr_ul_config_request_t ul_config_request;
   fapi_nr_dl_config_request_t dl_config_request;
 
diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
index bb412752b6..789650c97a 100644
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
@@ -109,9 +109,6 @@ int nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
 
   ret = nr_ue_scheduler(NULL, ul_info);
 
-  // clean previous FAPI messages
-  mac->tx_request.number_of_pdus = 0;
-
   if (is_nr_UL_slot(mac->scc, ul_info->slot_tx) && get_softmodem_params()->do_ra)
     nr_ue_prach_scheduler(module_id, ul_info->frame_tx, ul_info->slot_tx);
 
@@ -150,7 +147,6 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
     //hook up pointers
     mac->scheduled_response.dl_config = dl_config;
     mac->scheduled_response.ul_config = ul_config;
-    mac->scheduled_response.tx_request = &mac->tx_request;
     mac->scheduled_response.module_id = dl_info->module_id;
     mac->scheduled_response.CC_id = dl_info->cc_id;
     mac->scheduled_response.frame = dl_info->frame;