Fixed locking issue with RS re-registration