Weapon swap when entering archwing if just performed melee

[Vrokyn]

I've noticed during Plaguestar that if you've just performed a melee attack (armour strip with Vastilok) then it will automatically equip my primary weapon when I launch into archwing forcing me to swap weapons to DPS, regardless of whether I had my secondary equipped prior to performing the melee attack. Is there a way around this, or is this just an unfortunate side effect of melee attacking being coded in as a weapon swap and it just defaulting back to primary when in archwing because you can't technically melee?

Vrokyn