diff --git a/src/Plugin/views/field/EntityFormField.php b/src/Plugin/views/field/EntityFormField.php
index 70777c7..31b553f 100644
--- a/src/Plugin/views/field/EntityFormField.php
+++ b/src/Plugin/views/field/EntityFormField.php
@@ -565,7 +565,7 @@ class EntityFormField extends FieldPluginBase implements CacheableDependencyInte
     // Set this value back to it's relevant entity from each row.
     foreach ($this->getView()->result as $row_index => $row) {
       // Check to make sure that this entity has a relevant field.
-      $entity = $this->getEntity($row);
+      $entity = $this->getEntityTranslation($this->getEntity($row), $row);
       if ($entity && $entity->hasField($field_name) && $this->getBundleFieldDefinition($entity->bundle())->isDisplayConfigurable('form')) {
         // Get current entity field values.
         $items = $entity->get($field_name)->filterEmptyItems();
@@ -670,7 +670,12 @@ class EntityFormField extends FieldPluginBase implements CacheableDependencyInte
    * {@inheritdoc}
    */
   public function query() {
-    // Do nothing.
+    // We purposefully do not call parent::query() because we do not want the
+    // default query behavior for Views fields. Instead, let the entity
+    // translation renderer provide the correct query behavior.
+    if ($this->languageManager->isMultilingual()) {
+      $this->getEntityTranslationRenderer()->query($this->query, $this->relationship);
+    }
   }
 
 }