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 179ee9a58e..659fab1994 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/EmailConstraint.php
@@ -16,7 +16,15 @@
  */
 class EmailConstraint extends Email {
 
-  public $strict = TRUE;
+  public function __construct($options = []) {
+    if (property_exists($this, 'mode')) {
+      $this->mode = 'strict';
+    }
+    else {
+      $this->strict = TRUE;
+    }
+  }
+
 
   /**
    * {@inheritdoc}