diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index dddad7c..b3ea75d 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -701,7 +701,7 @@ function content_translation_language_configuration_element_process(array $eleme
     $element['content_translation'] = array(
       '#type' => 'checkbox',
       '#title' => t('Enable translation'),
-      '#default_value' => content_translation_enabled($context['entity_type'], $context['bundle']),
+      '#default_value' => $context['bundle'] ? content_translation_enabled($context['entity_type'], $context['bundle']) : FALSE,
       '#element_validate' => array('content_translation_language_configuration_element_validate'),
       '#prefix' => '<label>' . t('Translation') . '</label>',
     );
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php b/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
new file mode 100644
index 0000000..ec71b2b
--- /dev/null
+++ b/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\entity\Tests\ContentTranslationEntityBundleUITest.
+ */
+
+namespace Drupal\content_translation\Tests;
+
+use Drupal\Core\Language\Language;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the content translation on entity bundle UI.
+ *
+ * @group content_translation
+ */
+class ContentTranslationEntityBundleUITest extends WebTestBase {
+
+  public static $modules = array('language', 'content_translation', 'node', 'comment', 'field_ui');
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content translation', 'administer content types'));
+    $this->drupalLogin($user);
+  }
+
+  /**
+   * Tests the content translation configuration on content type manage page.
+   */
+  public function testContentTypeUI() {
+    // Create first content type.
+    $this->drupalCreateContentType(array('type' => 'article'));
+    // Enable content translation.
+    $edit = array('language_configuration[content_translation]' => TRUE);
+    $this->drupalPostForm('admin/structure/types/manage/article', $edit, 'Save content type');
+
+    // Make sure add page does not inherit translation configuration from first
+    // content type.
+    $this->drupalGet('admin/structure/types/add');
+    $this->assertNoFieldChecked('edit-language-configuration-content-translation');
+  }
+
+}