Various aspects of the present disclosure generally relate to wireless communication. In some aspects, a user equipment (UE) may start, at a default data subscription (DDS) of the UE, a timer associated with a non-Third Generation Partnership Project (non-3GPP) tunnel over a cellular network based at least in part on a DDS switching at the UE. The UE may determine, at the DDS, that the non-3GPP tunnel over the cellular network is available prior to an expiry of the timer. The UE may perform a handover of a non-3GPP tunnel over data connection to the DDS based at least in part on the DDS switching at the UE and the non-3GPP tunnel over the cellular network being available prior to the expiry of the timer. Numerous other aspects are described.