diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
index 31d9e17..e7ea312 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
+use Drupal\views\ResultRow;
 use Drupal\views\ViewExecutable;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -140,23 +141,52 @@ public function summaryTitle() {
     }
   }
 
+  public function query() {
+    parent::query();
+
+    $base_table = $this->entityInfo['base_table'];
+    /** @var $query \Drupal\views\Plugin\views\query\Sql */
+    $query = $this->view->getQuery();
+    $query->addField($base_table, 'langcode');
+  }
+
   /**
    * {@inheritdoc}
    */
   public function preRender($result) {
     parent::preRender($result);
 
+    $view_builder = \Drupal::entityManager()->getViewBuilder($this->entityType);
+
     if ($result) {
       // Get all entities which will be used to render in rows.
+      /** @var \Drupal\Core\Entity\ContentEntityInterface[] $entities */
       $entities = array();
+      $langcodes = array();
+      /** @var \Drupal\views\ResultRow $row */
       foreach ($result as $row) {
         $entity = $row->_entity;
         $entity->view = $this->view;
         $entities[$entity->id()] = $entity;
+        $langcodes[$entity->id()] = $row->langcode;
+      }
+      $count_langcodes = count(array_unique($langcodes));
+
+      // Render each entity separate if we do have more than one translation.
+      // @todo It should be possible to use viewMultiple even if you get
+      //   more than one language.
+      if ($count_langcodes > 1) {
+        foreach ($entities as $entity) {
+          $langcode = $langcodes[$entity->id()];
+          $entity = $entity->getTranslation($langcode);
+          $this->build[$entity->id()] = $view_builder->view($entity, $this->options['view_mode'], $langcode);
+        }
+      }
+      else {
+        // Prepare the render arrays for all rows.
+        $this->build = $view_builder->viewMultiple($entities, $this->options['view_mode'], current($langcode));
       }
 
-      // Prepare the render arrays for all rows.
-      $this->build = entity_view_multiple($entities, $this->options['view_mode']);
     }
   }