diff --git a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
index 4d37495a43..00bcaf6032 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
@@ -2458,7 +2458,10 @@ void ulsch_scheduler_pre_ue_select_fairRR(
     UE_sched_ctl = &UE_info->UE_sched_ctrl[UE_id];
     int bytes_to_schedule = UE_info->UE_template[CC_id][UE_id].estimated_ul_buffer - UE_info->UE_template[CC_id][UE_id].scheduled_ul_bytes;
 
-    if (bytes_to_schedule < 0) bytes_to_schedule = 0;
+    if (bytes_to_schedule < 0) {
+      bytes_to_schedule = 0;
+      UE_list->UE_template[CC_id][UE_id].scheduled_ul_bytes = 0;
+    }
     rrc_status = mac_eNB_get_rrc_status(module_idP, rnti);
 
     if ( (bytes_to_schedule > 0) || (UE_info->UE_template[CC_id][UE_id].ul_SR > 0) ||
diff --git a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
index b4d7d7bbef..9116608037 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
@@ -553,6 +553,8 @@ rx_sdu(const module_id_t enb_mod_idP,
             UE_template_ptr->ul_buffer_info[LCGID1] +
             UE_template_ptr->ul_buffer_info[LCGID2] +
             UE_template_ptr->ul_buffer_info[LCGID3];
+          UE_template_ptr->scheduled_ul_bytes = 0;
+
           RC.eNB[enb_mod_idP][CC_idP]->pusch_stats_bsr[UE_id][(frameP * 10) + subframeP] = (payload_ptr[0] & 0x3f);
 
           if (UE_id == UE_info->list.head) {
@@ -598,6 +600,8 @@ rx_sdu(const module_id_t enb_mod_idP,
             UE_template_ptr->ul_buffer_info[LCGID1] +
             UE_template_ptr->ul_buffer_info[LCGID2] +
             UE_template_ptr->ul_buffer_info[LCGID3];
+          UE_template_ptr->scheduled_ul_bytes = 0;
+
           LOG_D(MAC, "[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR. Size is LCGID0 = %u LCGID1 = %u LCGID2 = %u LCGID3 = %u\n",
                 enb_mod_idP,
                 CC_idP,
@@ -794,6 +798,9 @@ rx_sdu(const module_id_t enb_mod_idP,
               UE_template_ptr->ul_buffer_info[1] +
               UE_template_ptr->ul_buffer_info[2] +
               UE_template_ptr->ul_buffer_info[3];
+              if (UE_template_ptr->estimated_ul_buffer == 0) {
+                UE_template_ptr->scheduled_ul_bytes = 0;
+              }
             //UE_template_ptr->estimated_ul_buffer += UE_template_ptr->estimated_ul_buffer / 4;
           }
 
@@ -859,6 +866,9 @@ rx_sdu(const module_id_t enb_mod_idP,
                 UE_template_ptr->ul_buffer_info[1] +
                 UE_template_ptr->ul_buffer_info[2] +
                 UE_template_ptr->ul_buffer_info[3];
+              if (UE_template_ptr->estimated_ul_buffer == 0) {
+                UE_template_ptr->scheduled_ul_bytes = 0;
+              }
             }
 
             if ((rx_lengths[i] < SCH_PAYLOAD_SIZE_MAX) && (rx_lengths[i] > 0)) {  // MAX SIZE OF transport block