For ENG-5972, don't leak the selector at startup