diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index e2f2871e7b..4f7553c2bc 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -976,7 +976,9 @@ function user_mail($key, &$message, $params) {
 function user_mail_tokens(&$replacements, $data, $options) {
   if (isset($data['user'])) {
     $replacements['[user:one-time-login-url]'] = user_pass_reset_url($data['user'], $options);
-    $replacements['[user:mail-change-url]'] = MailChangeController::getUrl($data['user'], $options)->toString();
+    if ($data['user']->getEmail()) {
+      $replacements['[user:mail-change-url]'] = MailChangeController::getUrl($data['user'], $options)->toString();
+    }
     $replacements['[user:cancel-url]'] = user_cancel_url($data['user'], $options);
   }
 }