diff --git a/core/modules/node/src/ContextProvider/NodeRouteContext.php b/core/modules/node/src/ContextProvider/NodeRouteContext.php
index 06ad35f429..e738cf6cb0 100644
--- a/core/modules/node/src/ContextProvider/NodeRouteContext.php
+++ b/core/modules/node/src/ContextProvider/NodeRouteContext.php
@@ -45,7 +45,7 @@ public function getRuntimeContexts(array $unqualified_context_ids) {
     if (($route_object = $this->routeMatch->getRouteObject())) {
       $route_contexts = $route_object->getOption('parameters');
       // Check for a node revision parameter first.
-      if ($revision = $this->routeMatch->getParameter('node_revision')) {
+      if (isset($route_contexts['node_revision']) && $revision = $this->routeMatch->getParameter('node_revision')) {
         $value = $revision;
       }
       elseif (isset($route_contexts['node']) && $node = $this->routeMatch->getParameter('node')) {