diff --git a/api/etemplate.php b/api/etemplate.php
index 65db1d42a9..3567912ca5 100644
--- a/api/etemplate.php
+++ b/api/etemplate.php
@@ -289,6 +289,12 @@ function send_template()
 					$attrs['multiple'] = 'true';
 					unset($attrs['expand_multiple_rows']);
 				}
+				// automatic convert empty_label for multiple=true to a placeholder
+				if (!empty($attrs['empty_label']) && !empty($attrs['multiple']))
+				{
+					$attrs['placeholder'] = $attrs['empty_label'];
+					unset($attrs['empty_label']);
+				}
 				// type attribute need to go in widget type <select type="select-account" --> <et2-select-account
 				if (empty($matches[2]) && isset($attrs['type']))
 				{
diff --git a/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts b/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts
index a88129332c..6f678ce7f4 100644
--- a/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts
+++ b/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts
@@ -150,13 +150,6 @@ export const Et2widgetWithSelectMixin = <T extends Constructor<LitElement>>(supe
 			this.__select_options = cleanSelectOptions(new_options);
 
 			this.requestUpdate("select_options", old_options);
-
-			// if single selection and value does not match an option, use the first option
-			if (!this.multiple && !this.empty_label && this.__select_options.length &&
-				!this.__select_options.filter(option => option.value === this.value).length)
-			{
-				this.value = this.__select_options[0].value;
-			}
 		}
 
 		/**