A method of video decoding at a decoder can include receiving a bitstream including encoded data of a picture, decoding a plurality of coding units (CUs) in the picture based on motion information stored in a history-based motion vector prediction (HMVP) table, resetting the HMVP table for every N CTU rows. The method also provides updating the HMVP table with the motion information of the last Q of the plurality of CUs.