Using command skills while shapeshifted ends shapeshift if the command skill is on cooldown.

The title describes the issue rather fully. Since the latest patch we can now use command skills while shapeshifted, and this works great.
Except if you press the command skill while it is on cooldown/has no charges left, in which case you "un-shapeshift" for no apparent reason.

I happen to have a shield in my second weapons set for emergencies and no "plus minions skills", and insufficient spirit for my important minions, thus un-shifting and forcefully weapons swapping is quite detrimental to me.

One of the command skills I use is Kelari's Deception, which has a very short cast time and you'd often want to use all charges at once, but holding the button until all charges are used will inevitable "un-shift" me and force a weapon swap.

Further information:
This only happens when I have a sceptre in the (non-shifted) weapon slot equipped, having a wand instead prevents the forced un-shift. I'd really rather have the sceptre though.

Further further info:
This is super weird, the above behavior was true when I had only Kelari specced in my ascendancy, but after changing my build and speccing into all three minions I now un-shift when using a command skill that is on cooldown regardless of sceptre or not in the other weapon set.

This is hella confusing.

For some reason having Frost Mages active on my un-shifted weapon set prevents the forced un-shift on using a command skill that is on cooldown. Except if I use certain sceptres, but not others. I'm so confused.