The present technology is generally directed to optimizing a non-3GPP untrusted Wi-Fi to 5G system handover followed by Evolved Packet System (EPS) fallback, more specifically, to delaying removal of the Wi-Fi session resources and creating a voice flow as part of the EPS fallback. The present technology can receive a request for an EPS fallback from a mobile device for a handover to a 5G network while the mobile device is in communication over non-3GPP access network, maintain one or more resources of the non-3GPP access network during data path switching from the non-3GPP access network to the 5G network, generate a list of EPS bearer identifiers to transmit to an access and mobility management function (AMF), wherein the list of EPS bearer identifiers is associated with a voice flow to transfer the one or more resources of the non-3GPP access network as part of the handover from the non-3GPP access network to the 5G network, and transmit the list of EPS bearer identifiers to a mobility management entity (MME).