A method for reducing data loss when a client device performs a handoff from a first radio station to a second radio station. The method includes detecting imminence of the handoff using one or more criteria. The method also includes buffering incoming data upon the imminence of the handoff to generate buffered incoming data, the incoming data being addressed to the client device. The method further includes transmitting the buffered incoming data to the client device through the second radio station if the handoff is completed and if the buffered incoming data is not discarded.