Simple answer is yes. Sorry for late response. Hope this helps someone at least in a similar situation. The exert to answer this question:
Once you reach full retirement age, your benefits simply convert to retirement benefits, but your payment amount will not change. Your future retirement benefits are not reduced even though you were able to collect Social Security early. Also, you will get the benefit of a “disability freeze.”
Here are some resources to fully answer how it works:
Getting Social Security Disability Benefits After Age 60
What Will Happen to My Disability Benefits When I Turn 65?