diff --git a/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php b/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
index 241ce456cb..2bb018edf7 100644
--- a/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
+++ b/core/lib/Drupal/Core/Entity/Element/EntityAutocomplete.php
@@ -327,7 +327,13 @@ protected static function matchEntityByTitle(SelectionInterface $handler, $input
     if (empty($entities)) {
       if ($strict) {
         // Error if there are no entities available for a required field.
-        $form_state->setError($element, t('There are no entities matching "%value".', $params));
+        $entity_type_label = \Drupal::entityTypeManager()->getDefinition($element['#target_type'])->getPluralLabel();
+        if (isset($entity_type_label)) {
+          $form_state->setError($element, t('Invalid value "%value" chosen for "%field_name".', $params + ['%field_name' => $entity_type_label]));
+        }
+        else{
+          $form_state->setError($element, t('There are no entities matching "%value".', $params));
+        }
       }
     }
     elseif (count($entities) > 5) {
diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
index 086e245226..1dfe71a915 100644
--- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
+++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
@@ -172,7 +172,7 @@ public function testFieldAdminHandler() {
     $this->drupalPostForm('node/add/' . $this->type, $edit, t('Save'));
 
     // Assert that entity reference autocomplete field is validated.
-    $this->assertText(t('There are no entities matching "@entity"', ['@entity' => 'Test']));
+    $this->assertText(t('Invalid value "@value" chosen for "@field_name".', ['@value' => 'Test', '@field_name' => 'Test Entity Reference Field (value 1)']));
 
     $edit = [
       'title[0][value]' => 'Test',
diff --git a/core/modules/node/tests/src/Functional/NodeEditFormTest.php b/core/modules/node/tests/src/Functional/NodeEditFormTest.php
index 8e39d08456..927626729a 100644
--- a/core/modules/node/tests/src/Functional/NodeEditFormTest.php
+++ b/core/modules/node/tests/src/Functional/NodeEditFormTest.php
@@ -264,7 +264,7 @@ protected function checkVariousAuthoredByValues(NodeInterface $node, $form_eleme
       $form_element_name => 'invalid-name',
     ];
     $this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
-    $this->assertRaw(t('There are no entities matching "%name".', ['%name' => 'invalid-name']));
+    $this->assertRaw(t('Invalid value "%name" chosen for "%field_name".', ['%name' => 'invalid-name', '%field_name' => 'authored by']));
 
     // Change the authored by field to an empty string, which should assign
     // authorship to the anonymous user (uid 0).
diff --git a/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php b/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
index 2660593f5e..2e885b2d18 100644
--- a/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
+++ b/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
@@ -106,7 +106,7 @@ public function testAdminUserInterface() {
       'options[value]' => implode(', ', $users),
     ];
     $this->drupalPostForm($path, $edit, t('Apply'));
-    $this->assertRaw(t('There are no entities matching "%value".', ['%value' => implode(', ', $users)]));
+    $this->assertRaw(t('Invalid value "%value" chosen for "%field_name".', ['%value' => implode(', ', $users), '%field_name' => 'Usernames']));
 
     // Pass in an invalid username and a valid username.
     $random_name = $this->randomMachineName();
@@ -117,7 +117,7 @@ public function testAdminUserInterface() {
     ];
     $users = [$users[0]];
     $this->drupalPostForm($path, $edit, t('Apply'));
-    $this->assertRaw(t('There are no entities matching "%value".', ['%value' => implode(', ', $users)]));
+    $this->assertRaw(t('Invalid value "%value" chosen for "%field_name".', ['%value' => implode(', ', $users), '%field_name' => 'Usernames']));
 
     // Pass in just valid usernames.
     $users = $this->names;