XP Boost Timer as in BF1

Hello,

Could you please make it so the XP boost only counts down when I'm in a game, and not otherwise?
Right now there are server issues, and my 30-minute boost is active… it's a total waste.
Plus, it's annoying to watch the boost run out during matchmaking and while the servers are filling up without me getting any benefit from it.

I think the mechanic from BF1 is the fairest.

Thanks