diff --git a/core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
index 9afd180..8ae6bd0 100644
--- a/core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
+++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php
@@ -71,7 +71,7 @@ class BlockVisibility extends ProcessPluginBase implements ContainerFactoryPlugi
         $visibility['user_role']['roles'][$new_role] = $new_role;
       }
       $visibility['user_role']['id'] = 'user_role';
-      $visibility['user_role']['context_mapping']['user'] = 'user.current_user';
+      $visibility['user_role']['context_mapping']['user'] = '@user.current_user_context:current_user';
     }
     return $visibility;
   }
