diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index dbc371d..1527ac6 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -430,7 +430,7 @@ public function updateFromStorageRecord(ConfigEntityInterface $entity, array $va
    */
   public function loadOverrideFree($id) {
     $entities = $this->loadMultipleOverrideFree([$id]);
-    return reset($entities);
+    return isset($entities[$id]) ? $entities[$id] : NULL;
   }
 
   /**
diff --git a/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php b/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
index d21c613..9b5cc52 100644
--- a/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
+++ b/core/modules/config_translation/src/Form/ConfigTranslationFormBase.php
@@ -201,7 +201,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       $schema = $this->typedConfigManager->get($name);
 
       // Set configuration values based on form submission and source values.
-      $base_config = $config_factory->getEditable($name);
+      $base_config = $this->configFactory()->getEditable($name);
       $config_translation = $this->languageManager->getLanguageConfigOverride($this->language->getId(), $name);
 
       $element = $this->createFormElement($schema);