diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index eb14412..1e2941b 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -198,8 +198,14 @@ function language_configuration_element_submit(&$form, FormStateInterface $form_
  *   - language_show: if the language element should be hidden or not.
  */
 function language_save_default_configuration($entity_type, $bundle, $values = array()) {
-  \Drupal::config('language.content_settings.' . String::checkPlain($entity_type))->set('entities.'. $bundle,
-      array('langcode' => $values['langcode'], 'language_show' => $values['language_show']))->save();
+  $config = ContentBundleLanguageSettings::loadByEntityTypeBundle($entity_type, $bundle);
+  if (isset($values['langcode'])) {
+    $config->setDefaultLangcode(String::checkPlain($values['langcode']));
+  }
+  if (isset($values['language_show'])) {
+    $config->setLanguageShow(String::checkPlain($values['language_show']));
+  }
+  $config->save();
 }
 
 /**
@@ -217,7 +223,7 @@ function language_save_default_configuration($entity_type, $bundle, $values = ar
  */
 function language_get_default_configuration($entity_type, $bundle) {
   $config = ContentBundleLanguageSettings::loadByEntityTypeBundle($entity_type, $bundle);
-  return ['language_show' => $config->getLanguageShow(), 'langcode' => $config->getDefaultLangcode()];
+  return ['langcode' => $config->getDefaultLangcode(), 'language_show' => $config->getLanguageShow()];
 }
 
 /**
diff --git a/core/modules/language/src/Entity/ContentBundleLanguageSettings.php b/core/modules/language/src/Entity/ContentBundleLanguageSettings.php
index 31c789e..c11402c 100644
--- a/core/modules/language/src/Entity/ContentBundleLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentBundleLanguageSettings.php
@@ -17,9 +17,6 @@
  * @ConfigEntityType(
  *   id = "content_language_settings",
  *   label = @Translation("Content Bundle Language Settings"),
- *   fieldable = FALSE,
- *   handlers = {
- *   },
  *   admin_permission = "administer languages",
  *   config_prefix = "content_settings",
  *   entity_keys = {
@@ -45,12 +42,12 @@ class ContentBundleLanguageSettings extends ConfigEntityBase {
 
 
   /**
-   * @var string $defaultLangcode
+   * @var string $default_langcode
    */
   protected $default_langcode;
 
   /**
-   * @var boolean $languageShow
+   * @var boolean $language_show
    */
   protected $language_show;