diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 6fcbc2b..1bc2408 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -532,6 +532,7 @@ function comment_entity_view(EntityInterface $entity, EntityDisplay $display, $v
           if (user_access('post comments')) {
             $links['comment-add'] = array(
               'title' => t('Add new comment'),
+              'language' => $entity->language()->id,
               'href' => $uri['path'],
               'attributes' => array('title' => t('Add a new comment to this page.')),
               'fragment' => 'comment-form',
diff --git a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
index 036d283..8e0705c 100644
--- a/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
+++ b/core/modules/node/lib/Drupal/node/NodeViewBuilder.php
@@ -50,6 +50,7 @@ public function buildContent(array $entities, array $displays, $view_mode, $lang
             '@title' => $node_title_stripped,
           )),
           'href' => 'node/' . $entity->id(),
+          'language' => $entity->language()->id,
           'html' => TRUE,
           'attributes' => array(
             'rel' => 'tag',
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index a1bde76..79267cb 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -679,6 +679,7 @@ function template_preprocess_node(&$variables) {
   $variables['name'] = drupal_render($username);
 
   $uri = $node->uri();
+  $uri['options']['language'] = $node->language()->id;
   $variables['node_url']  = url($uri['path'], $uri['options']);
   $variables['label'] = $variables['elements']['title'];
   unset($variables['elements']['title']);