On the first page of this thread is a post by cparke3 on 4/17/2020. I followed those instructions and have never seen the old states again. Suggest reading that post and, if you're comfortable, do the steps outlined. It worked for me. See my post on Junary 2021 thanking cparke3.
It is a shame that TT won't fix this very irratating issue, but there is a way to get it to stop.
