diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index dddad7c..e784b54 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -300,11 +300,11 @@ function content_translation_set_config($entity_type, $bundle, $setting, $value)
  *
  * @todo Move to \Drupal\content_translation\ContentTranslationManager.
  */
-function content_translation_enabled($entity_type, $bundle = NULL) {
+function content_translation_enabled($entity_type, $bundle = FALSE) {
   $enabled = FALSE;
 
   if (\Drupal::service('content_translation.manager')->isSupported($entity_type)) {
-    $bundles = !empty($bundle) ? array($bundle) : array_keys(entity_get_bundles($entity_type));
+    $bundles = $bundle !== FALSE ? array($bundle) : array_keys(entity_get_bundles($entity_type));
     foreach ($bundles as $bundle) {
       if (content_translation_get_config($entity_type, $bundle, 'enabled')) {
         $enabled = TRUE;
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..b1a012d
--- /dev/null
+++ b/core/modules/content_translation/src/Tests/ContentTranslationEntityBundleUITest.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\content_translation\Tests\ContentTranslationEntityBundleUITest.
+ */
+
+namespace Drupal\content_translation\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the content translation behaviours on entity bundle UI.
+ *
+ * @group content_translation
+ */
+class ContentTranslationEntityBundleUITest extends WebTestBase {
+
+  public static $modules = array('language', 'content_translation', 'node', 'comment', 'field_ui');
+
+  protected function setUp() {
+    parent::setUp();
+    $user = $this->drupalCreateUser(array('access administration pages', 'administer languages', 'administer content translation', 'administer content types'));
+    $this->drupalLogin($user);
+  }
+
+  /**
+   * Tests content types default translation behaviour.
+   */
+  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');
+  }
+
+}