Weapon Swap disabling Reservation/Keeping Spirit Reserved

Every time I weapon swap on my huntress (Pounce talisman setup/Chober Chaber setup), my Spirit gets all sorts of messed up. The first weapon swap perma disables my smallest reservation, Wind Dancer, the second perma disables one of my companions. This is only fixed, but immediately fixed, by relogging. Relogging every two times I cast pounce is unacceptable.

Yeah I'm having a big problem with this same thing playing a Spirit Walker companion build. Every time I weapon swap away and back one of my minions disappears(up to a point). Fixes itself on entering a different zone for me, but it's super annoying to lose so much power in maps.