From bb4db86d6146640416b423a5a7705c97a94906e4 Mon Sep 17 00:00:00 2001
From: Melissa Elkadi <melissa@episci.com>
Date: Wed, 17 Nov 2021 15:38:43 -0800
Subject: [PATCH] Do not handle multiplexing of UCIs if nothing is in UCI queue

---
 openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
index 60b4f826a6..9e7eb1ee35 100644
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c
@@ -578,6 +578,10 @@ static void copy_ul_tti_data_req_to_dl_info(nr_downlink_indication_t *dl_info, n
               pdu_list->pdu_type, ul_tti_req->pdus_list[i].pucch_pdu.rnti, pdu_list->pucch_pdu.sr_flag, pdu_list->pucch_pdu.bit_len_harq);
         if (pdu_list->pdu_type == NFAPI_NR_UL_CONFIG_PUCCH_PDU_TYPE && pdu_list->pucch_pdu.rnti == mac->crnti)
         {
+            if (nr_uci_ind_queue.num_items <= 0)
+            {
+                return;
+            }
             nfapi_nr_uci_indication_t *uci_ind = multiplex_uci_ind(mac);
             if (uci_ind && uci_ind->num_ucis > 0)
             {