According to some embodiments, a method performed by a wireless device comprises: obtaining, from a non-access stratum (NAS) communication layer, an initial NAS protocol data unit (PDU) for potential early data transmission; determining, by an access-stratum (AS) communication layer, whether the initial NAS PDU is intended to be delivered when an associated radio resource control (RRC) connection is resumed successfully; and upon determining that the initial NAS PDU is not intended to be delivered when the associated RRC connection is resumed successfully, transmitting an early data transmission including the initial NAS PDU.