Grim Feast weapon set's

Question

I use grim feast in both my weapon sets

First set = wand + focus (gives me roughly 1.2k ES)
Second set = staff no ES (for blink + sigil of power setup)

My ES = 10k
My ES with grim feast = 20k

I swap to staff for blink or sigil i drop to 18.8ES obv. bcs staff no ES

Swapping back to wand + focus i dont get back the ES so if i just keep swappping i drop to 10k ES in about 8 swaps...

Before the patch it would go to 18.8 ES and then back to 20k once i switched back to Wand + Focus

If this is intended it would be very annoying, bcs i would have to use a replica of my weaponset 1 for mapping and keep my staff in my inventory for bosses.