Avoiding setting a default entity if not initially selected