Apply same router state fix to AMD notes