I was running 25.0.1.0 with hotfix 6 installed. I just noticed there was a new version, so I upgraded to that and my issue seems to have gone away.
Either it was fixed in the new version, or the automatic migration of the config folder fixed it somehow, either way, it works!