Charged Staff Buff UI persists but loses gameplay effect after Weapon Swap/Shapeshift

When transitioning from a Quarterstaff (with the "Charged Staff" buff active) to a shapeshifted form (Wolf/Wyvern) and then returning to the Quarterstaff, the buff icon remains visible on the UI, but the actual effects of the buff are lost. Reapplying the buff doesn't solve it. Either it has the wear off or i need to reequip my quarterstaff.
Steps to Reproduce:
Equip a Quarterstaff and use "Charged Staff".
Perform a Shapeshifting skill while the buff is active.
Return to the Quarterstaf.