This avoid multiple reselection and client freezes Change-Id: I73f5d933b6ce92e2b9557a1f62fc091c9fc16368