diff --git a/core/modules/views/src/EntityViewsData.php b/core/modules/views/src/EntityViewsData.php
index 61def5a..73d9781 100644
--- a/core/modules/views/src/EntityViewsData.php
+++ b/core/modules/views/src/EntityViewsData.php
@@ -436,7 +436,13 @@ protected function mapSingleFieldViewsData($table, $field_name, $field_type, $co
         break;
 
       case 'language':
-        $views_field['field']['id'] = 'field';
+        if ($table == $this->entityType->getBaseTable() || $table == $this->entityType->getRevisionTable()) {
+          // Use the language handler for the original language.
+          $views_field['field']['id'] = 'language';
+        }
+        else {
+          $views_field['field']['id'] = 'field';
+        }
         $views_field['argument']['id'] = 'language';
         $views_field['filter']['id'] = 'language';
         $views_field['sort']['id'] = 'standard';