Issue #1974202 by theunraveler: Fixed not saving values when entity ID is missing from the autocomplete.