Did a code patch get applied to this issue recently?
In order to keep my rides from going to the wrong club, I set it to the club I race for, even if the event wasn’t a race. This demonstrated that, if you selected a club, it remembered the club vs defaulting to the first club in the list.
Recently, I noticed that my selected club was showing up first in the list in CA. 
I don’t know why it shuffled the order but whatever.
However, that got me curious. So, I set a warmup ride to No Club and saved. Then, after the workout ride, I crossed my fingers and hoped to see No Club. Instead, I saw the last club I selected during a save versus the first club I ever joined - like the issue started out as.
So, either something attempted to be fixed in the last update or the problem isn’t that simple.