Talk:Mastery Rank/@comment-14.192.212.172-20170516091442/@comment-25254386-20170516121637

Yes you will. The next time you rank up all the excess affinity you gained will transfer over towards the next ranks.