Your patch works.
Thank you.
I will test tomorrow. But might be simpler to just use:
if (!$element['#value']) {
hershel → created an issue.