diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index 95832f5158..a182a9e2c1 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -999,12 +999,21 @@ void nr_schedule_ue_spec(module_id_t module_id,
     NR_tda_info_t *tda_info = &sched_pdsch->tda_info;
     NR_pdsch_dmrs_t *dmrs_parms = &sched_pdsch->dmrs_parms;
     NR_UE_harq_t *harq = &sched_ctrl->harq_processes[current_harq_pid];
-    DevAssert(!harq->is_waiting);
-    add_tail_nr_list(&sched_ctrl->feedback_dl_harq, current_harq_pid);
     NR_sched_pucch_t *pucch = &sched_ctrl->sched_pucch[sched_pdsch->pucch_allocation];
-    harq->feedback_frame = pucch->frame;
-    harq->feedback_slot = pucch->ul_slot;
-    harq->is_waiting = true;
+    DevAssert(!harq->is_waiting);
+    if (get_FeedbackDisabled(UE->sc_info.downlinkHARQ_FeedbackDisabled_r17, current_harq_pid)) {
+      add_tail_nr_list(&sched_ctrl->available_dl_harq, current_harq_pid);
+      harq->feedback_frame = -1;
+      harq->feedback_slot = -1;
+      harq->is_waiting = false;
+      harq->ndi ^= 1;
+      harq->round = 0;
+    } else {
+      add_tail_nr_list(&sched_ctrl->feedback_dl_harq, current_harq_pid);
+      harq->feedback_frame = pucch->frame;
+      harq->feedback_slot = pucch->ul_slot;
+      harq->is_waiting = true;
+    }
     UE->mac_stats.dl.rounds[harq->round]++;
     LOG_D(NR_MAC,
           "%4d.%2d [DLSCH/PDSCH/PUCCH] RNTI %04x DCI L %d start %3d RBs %3d startSymbol %2d nb_symbol %2d dmrspos %x MCS %2d nrOfLayers %d TBS %4d HARQ PID %2d round %d RV %d NDI %d dl_data_to_ULACK %d (%d.%d) PUCCH allocation %d TPC %d\n",