Embodiments include methods, performed by a user equipment (UE), for receiving downlink (DL) data from a serving cell in a wireless network. Such methods include determining whether a total number of coded bits for all transport blocks (TBs) scheduled for the UE, by the wireless network in the serving cell during a plurality of consecutive symbols, is greater than a limited-buffer rate-matching (LBRM) threshold. The LBRM threshold is based on a maximum number of transmission layers, X, associated with the UE for the serving cell. Such methods also include receiving and decoding a plurality of TBs, comprising one or more DL data messages, when the total number of coded bits for all TBs (including the plurality of TBs) scheduled for the UE is not greater than the LBRM threshold. Other embodiments include complementary methods performed by network nodes, and UEs and network nodes configured to perform such methods.