diff --git a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
index 0b4c7a1532..dd29b650f0 100644
--- a/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
+++ b/core/lib/Drupal/Core/Plugin/Context/ContextDefinition.php
@@ -267,9 +267,6 @@ public function isSatisfiedBy(ContextInterface $context) {
     if ($this->getDataType() != 'any' && $definition->getDataType() != $this->getDataType()) {
       return FALSE;
     }
-    if ($definition->getDataType() == 'entity:user' && $this->getDataType() == 'entity:user') {
-      return TRUE;
-    }
 
     $values = function () use ($context, $definition) {
       // Get the value for this context, either directly if possible
diff --git a/core/modules/user/src/ContextProvider/CurrentUserContext.php b/core/modules/user/src/ContextProvider/CurrentUserContext.php
index e9eccd8190..05d8194cb1 100644
--- a/core/modules/user/src/ContextProvider/CurrentUserContext.php
+++ b/core/modules/user/src/ContextProvider/CurrentUserContext.php
@@ -49,6 +49,7 @@ public function __construct(AccountInterface $account, EntityManagerInterface $e
    */
   public function getRuntimeContexts(array $unqualified_context_ids) {
     $current_user = $this->userStorage->load($this->account->id());
+    $current_user->_skipProtectedUserFieldConstraint = TRUE;
 
     $context = new Context(new ContextDefinition('entity:user', $this->t('Current user')), $current_user);
     $cacheability = new CacheableMetadata();