diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index a9bd9b0..c3088cf 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -83,7 +83,9 @@ function path_entity_base_field_info(EntityTypeInterface $entity_type) {
  * Implements hook_entity_translation_delete().
  */
 function path_entity_translation_delete(EntityInterface $translation) {
-  $path = $translation->urlInfo()->getInternalPath();
-  $conditions = array('source' => '/' . $path, 'langcode' => $translation->language()->getId());
-  \Drupal::service('path.alias_storage')->delete($conditions);
+  if ($translation->hasLinkTemplate('canonical')) {
+    $path = $translation->urlInfo()->getInternalPath();
+    $conditions = array('source' => '/' . $path, 'langcode' => $translation->language()->getId());
+    \Drupal::service('path.alias_storage')->delete($conditions);
+  }
 }
diff --git a/core/modules/path/src/Tests/PathNoCanonicalLinkTest.php b/core/modules/path/src/Tests/PathNoCanonicalLinkTest.php
new file mode 100644
index 0000000..5fb203c
--- /dev/null
+++ b/core/modules/path/src/Tests/PathNoCanonicalLinkTest.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\path\Tests\PathNoCanonicalLinkTest.
+ */
+
+namespace Drupal\path\Tests;
+use Drupal\content_translation_test\Entity\EntityTestTranslatableUISkip;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests the Path when no canonical link template.
+ *
+ * @group path
+ */
+class PathNoCanonicalLinkTest extends PathTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('path', 'content_translation_test');
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create test user and login.
+    $admin_user = $this->drupalCreateUser(array(
+      'translate any entity',
+      'administer content translation',
+      'administer languages',
+      'administer content types',
+    ));
+    $this->drupalLogin($admin_user);
+
+    ConfigurableLanguage::createFromLangcode('de')->save();
+  }
+
+  /**
+   * Tests for no canonical link templates.
+   */
+  public function testNoCanonicalLinkTemplate() {
+    // Visit the content translation.
+    $this->drupalGet('admin/config/regional/content-language');
+
+    $this->assertText('Test entity - Translatable skip UI check');
+    $this->assertText('Test entity - Translatable check UI (Translation is not supported)');
+
+    $edit = array(
+      'entity_types[entity_test_translatable_UI_skip]' => 'entity_test_translatable_UI_skip',
+      'settings[entity_test_translatable_UI_skip][entity_test_translatable_UI_skip][translatable]' => TRUE,
+      'settings[entity_test_translatable_UI_skip][entity_test_translatable_UI_skip][settings][language][language_alterable]' => TRUE,
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save configuration'));
+    $this->drupalGet('admin/config/regional/content-language');
+
+    $entity_type = EntityTestTranslatableUISkip::create([
+      'name' => 'name english',
+      'language' => 'en'
+    ]);
+    $entity_type->save();
+
+    $entity_type->addTranslation('de', ['name' => 'name italian']);
+    $entity_type->save();
+    $this->assertEqual(count($entity_type->getTranslationLanguages()), 2);
+
+    $entity_type->removeTranslation('de');
+    $entity_type->save();
+    $this->assertEqual(count($entity_type->getTranslationLanguages()), 1);
+  }
+
+}