diff --git a/modules/graphql_compose_routes/src/Plugin/GraphQL/SchemaExtension/RouteSchemaExtension.php b/modules/graphql_compose_routes/src/Plugin/GraphQL/SchemaExtension/RouteSchemaExtension.php
index b9467ca7d5e8d4e6fcfc4ccf15b03eb2536a60e1..17eb8c72949748b9fe82bd63d7cf5813b035d72d 100644
--- a/modules/graphql_compose_routes/src/Plugin/GraphQL/SchemaExtension/RouteSchemaExtension.php
+++ b/modules/graphql_compose_routes/src/Plugin/GraphQL/SchemaExtension/RouteSchemaExtension.php
@@ -65,9 +65,13 @@ class RouteSchemaExtension extends SdlSchemaExtensionPluginBase implements Conta
     $registry->addFieldResolver(
       'Query',
       'route',
-      $builder->produce('url_or_redirect')
-        ->map('path', $builder->fromArgument('path'))
-        ->map('langcode', $builder->fromArgument('langcode')),
+      $builder->compose(
+        $builder->produce('url_or_redirect')
+          ->map('path', $builder->fromArgument('path'))
+          ->map('langcode', $builder->fromArgument('langcode')),
+
+        $builder->context('langcode', $builder->fromArgument('langcode'))
+      )
     );
 
     $registry->addTypeResolver('RouteUnion', function ($value) {
@@ -103,7 +107,9 @@ class RouteSchemaExtension extends SdlSchemaExtensionPluginBase implements Conta
     $registry->addFieldResolver(
       'RouteInternal',
       'entity',
-      $builder->produce('route_entity')->map('url', $builder->fromParent())
+      $builder->produce('route_entity')
+        ->map('url', $builder->fromParent())
+        ->map('language', $builder->fromContext('langcode'))
     );
 
     $registry->addFieldResolver(
diff --git a/modules/graphql_compose_routes/src/Plugin/GraphQLCompose/SchemaType/Route.php b/modules/graphql_compose_routes/src/Plugin/GraphQLCompose/SchemaType/Route.php
index a963f34f3194e1c34818de9a84acb5a445afafbf..52fdae12b16c43fb32a3e71a8db67345e6fb635d 100644
--- a/modules/graphql_compose_routes/src/Plugin/GraphQLCompose/SchemaType/Route.php
+++ b/modules/graphql_compose_routes/src/Plugin/GraphQLCompose/SchemaType/Route.php
@@ -88,8 +88,7 @@ class Route extends GraphQLComposeSchemaTypeBase implements ContainerFactoryPlug
             ],
             'langcode' => [
               'type' => Type::string(),
-              'description' => (string) $this->t('Optionally filter the route by language. Eg en, ja, fr. Defaults to site default language.'),
-              'defaultValue' => $this->languageManager->getDefaultLanguage()->getId(),
+              'description' => (string) $this->t('Optionally filter the route by language. Eg en, ja, fr.'),
             ],
           ],
         ],