diff --git a/core/lib/Drupal/Core/Entity/EntityType.php b/core/lib/Drupal/Core/Entity/EntityType.php
index 7f49c18..14422c8 100644
--- a/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/core/lib/Drupal/Core/Entity/EntityType.php
@@ -796,7 +796,7 @@ public function addConstraint($constraint_name, $options = NULL) {
   public function getBundleConfigDependency($bundle) {
     // If this entity type uses entities to manage its bundles then depend on
     // the bundle entity.
-    if ($bundle_entity_type_id = $this->getBundleEntityType()) {
+    if ($bundle != $this->id() && $bundle_entity_type_id = $this->getBundleEntityType()) {
       if (!$bundle_entity = \Drupal::entityManager()->getStorage($bundle_entity_type_id)->load($bundle)) {
         throw new \LogicException(sprintf('Missing bundle entity, entity type %s, entity id %s.', $bundle_entity_type_id, $bundle));
       }
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsBundlesTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsBundlesTest.php
new file mode 100644
index 0000000..6cc104c
--- /dev/null
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsBundlesTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\content_translation\Tests\ContentTranslationSettingsBundlesTest.
+ */
+
+namespace Drupal\content_translation\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the content translation settings UI no bundles.
+ *
+ * @group content_translation
+ */
+class ContentTranslationSettingsBundlesTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('language', 'content_translation', 'comment');
+
+  protected function setUp() {
+    parent::setUp();
+
+    $admin_user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content translation'));
+    $this->drupalLogin($admin_user);
+    $this->drupalPostForm('admin/config/regional/language/add', array('predefined_langcode' => 'it'), t('Add language'));
+  }
+
+  /**
+   * Tests that the settings UI saves when no bundles exist.
+   */
+  function testSettingsUI() {
+    $this->drupalPostForm('admin/config/regional/content-language', array(), t('Save configuration'));
+  }
+
+}