diff --git a/core/lib/Drupal/Core/Path/PathValidator.php b/core/lib/Drupal/Core/Path/PathValidator.php
index f7efdb1..35d04a2 100644
--- a/core/lib/Drupal/Core/Path/PathValidator.php
+++ b/core/lib/Drupal/Core/Path/PathValidator.php
@@ -155,6 +155,9 @@ protected function getPathAttributes($path, Request $request, $access_check) {
     $path = $this->pathProcessor->processInbound('/' . $path, $request);
 
     try {
+      $context = \Drupal::service('router.request_context');
+      $context->fromRequest($request);
+      $router->setContext($context);
       return $router->match($path);
     }
     catch (ResourceNotFoundException $e) {