diff --git a/packages/main/src/Select.ts b/packages/main/src/Select.ts
index 4f561454d019..1297a1a82db7 100644
--- a/packages/main/src/Select.ts
+++ b/packages/main/src/Select.ts
@@ -762,7 +762,7 @@ class Select extends UI5Element implements IFormInputElement {
 		if (this.shouldDisplayDefaultValueStateMessage) {
 			valueStateText = this.valueStateDefaultText;
 		} else {
-			valueStateText = this.valueStateMessageText.map(el => el.textContent).join(" ");
+			valueStateText = this.valueStateMessage.map(el => el.textContent).join(" ");
 		}
 
 		return `${this.valueStateTypeText} ${valueStateText}`;
@@ -854,12 +854,8 @@ class Select extends UI5Element implements IFormInputElement {
 		return getEffectiveAriaLabelText(this);
 	}
 
-	get valueStateMessageText() {
-		return this.getSlottedNodes("valueStateMessage").map(el => el.cloneNode(true));
-	}
-
 	get shouldDisplayDefaultValueStateMessage() {
-		return !this.valueStateMessageText.length && this.hasValueStateText;
+		return !this.valueStateMessage.length && this.hasValueStateText;
 	}
 
 	get hasValueStateText() {
diff --git a/packages/main/src/SelectPopover.hbs b/packages/main/src/SelectPopover.hbs
index 4fb40b8175b4..76a607e493ae 100644
--- a/packages/main/src/SelectPopover.hbs
+++ b/packages/main/src/SelectPopover.hbs
@@ -73,8 +73,6 @@
 	{{#if shouldDisplayDefaultValueStateMessage}}
 		{{valueStateText}}
 	{{else}}
-		{{#each valueStateMessageText}}
-			{{this}}
-		{{/each}}
+		<slot name="valueStateMessage"></slot>
 	{{/if}}
 {{/inline}}