diff --git a/packages/main/src/FileUploader.ts b/packages/main/src/FileUploader.ts
index 5d6219cfe93e..f0a112fb2df0 100644
--- a/packages/main/src/FileUploader.ts
+++ b/packages/main/src/FileUploader.ts
@@ -475,10 +475,6 @@ class FileUploader extends UI5Element implements IFormInputElement {
 		return this.hasValueState && this.valueState !== ValueState.Positive;
 	}
 
-	get valueStateMessageText() {
-		return this.getSlottedNodes("valueStateMessage").map(el => el.cloneNode(true));
-	}
-
 	get shouldDisplayDefaultValueStateMessage(): boolean {
 		return !this.valueStateMessage.length && this.hasValueStateText;
 	}
diff --git a/packages/main/src/FileUploaderPopover.hbs b/packages/main/src/FileUploaderPopover.hbs
index e94a46571822..a8561fbc4175 100644
--- a/packages/main/src/FileUploaderPopover.hbs
+++ b/packages/main/src/FileUploaderPopover.hbs
@@ -19,8 +19,6 @@
 	{{#if shouldDisplayDefaultValueStateMessage}}
 		{{valueStateText}}
 	{{else}}
-		{{#each valueStateMessageText}}
-			{{this}}
-		{{/each}}
+		<slot name="valueStateMessage"></slot>
 	{{/if}}
 {{/inline}}
\ No newline at end of file
diff --git a/packages/main/test/pages/FileUploader.html b/packages/main/test/pages/FileUploader.html
index 186749752de9..fafd6e81cb2d 100644
--- a/packages/main/test/pages/FileUploader.html
+++ b/packages/main/test/pages/FileUploader.html
@@ -36,7 +36,7 @@
 
 	<div>
 		<label>FileUploader with ValueState</label>
-		<ui5-file-uploader placeholder="upload file" value-state="Critical">
+		<ui5-file-uploader placeholder="upload file" value-state="Critical" id="fu-valuestate-test">
 			<ui5-button>Upload</ui5-button>
 		</ui5-file-uploader>
 
diff --git a/packages/main/test/specs/FileUploader.spec.js b/packages/main/test/specs/FileUploader.spec.js
index 1912f93e5540..335261a28642 100644
--- a/packages/main/test/specs/FileUploader.spec.js
+++ b/packages/main/test/specs/FileUploader.spec.js
@@ -48,4 +48,18 @@ describe("API", () => {
 
 		assert.notOk(await fileUploader.isFocused(), "Uploader isn't focusable");
 	});
+
+	it("Value state message of type 'Critical' is opened on focusing the File Uploader button", async () => {
+		await browser.url(`test/pages/FileUploader.html`);
+
+		const fileUploader = await browser.$("#fu-valuestate-test");
+		await browser.keys("Tab");
+		await browser.keys("Tab");
+		await browser.keys("Tab");
+
+		const valueState = await fileUploader.shadow$("ui5-popover");
+
+		assert.ok(await valueState.isExisting(), "Value state message exists.");
+		assert.ok(await valueState.getProperty("open"), "File Uploader in focus should have open value state message.");
+	});
 });