In one example, user equipment (UE) maintains one or multiple serving beams, and uses a serving beam to perform an uplink (UL) transmission of data. The data is stored in an uplink hybrid automatic repeat request (UL HARQ) buffer. When there is a failure to track the one or multiple serving beams, a beam recovery procedure is initialized. After successful completion of the beam recovery procedure, the UE retransmits the data stored in the UL HARQ buffer. The UE prevents the data from being flushed from the UL HARQ buffer when the failure to track the one or multiple serving beams occurs, so that the data can be retransmitted.