diff --git a/core/lib/Drupal/Core/Entity/EntityFormController.php b/core/lib/Drupal/Core/Entity/EntityFormController.php
index 07d1dc1..2ac4eea 100644
--- a/core/lib/Drupal/Core/Entity/EntityFormController.php
+++ b/core/lib/Drupal/Core/Entity/EntityFormController.php
@@ -148,9 +148,7 @@ protected function init(array &$form_state) {
 
     // Ensure we act on the translation object corresponding to the current form
     // language.
-    $translation = $this->getTranslatedEntity($form_state);
-    // Ensure that the entity object is a BC entity if the original one is.
-    $this->entity = $this->entity instanceof EntityBCDecorator ? $translation->getBCEntity() : $translation;
+    $this->entity = $this->getTranslatedEntity($form_state);
 
     // Prepare the entity to be presented in the entity form.
     $this->prepareEntity();
@@ -505,7 +503,9 @@ public function getEntity() {
    */
   protected function getTranslatedEntity(array $form_state) {
     $langcode = $this->getFormLangcode($form_state);
-    return $this->entity->getTranslation($langcode);
+    $translation = $this->entity->getTranslation($langcode);
+    // Ensure that the entity object is a BC entity if the original one is.
+    return $this->entity instanceof EntityBCDecorator ? $translation->getBCEntity() : $translation;
   }
 
   /**