diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php
index d269b70ea1e..6e82b9ac4c3 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php
@@ -28,7 +28,7 @@ class EmailConstraint extends Email {
    * {@inheritdoc}
    */
   public function validatedBy() {
-    return '\Symfony\Component\Validator\Constraints\EmailValidator';
+    return EmailValidator::class;
   }
 
 }
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailValidator.php
new file mode 100644
index 00000000000..a39d4c6a7ac
--- /dev/null
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailValidator.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
+
+use Symfony\Component\Validator\Constraints\Email;
+use Symfony\Component\Validator\Constraints\EmailValidator as SymfonyEmailValidator;
+
+/**
+ * Email constraint.
+ *
+ * Overrides the symfony validator to use the HTML 5 setting.
+ *
+ * @internal Exists only to override the constructor to avoid a deprecation
+ *   in Symfony 6, and will be removed in drupal:11.0.0.
+ */
+final class EmailValidator extends SymfonyEmailValidator {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(string $defaultMode = Email::VALIDATION_MODE_HTML5) {
+    parent::__construct($defaultMode);
+  }
+
+}