Systems and methods are described for avoiding packet loss during a handover. A handover request may be received at a control element of a first communication network. It may be determined that the handover request comprises a first type of handover request. A gateway node of the first communication network may be instructed to buffer packets for the wireless device based on the determination that the handover request comprises a first type of handover request. And the gateway node may be instructed to stop buffering the packets for the wireless device based on an execution of the requested handover.