Fix issue during first registration/connect