diff --git a/core/modules/file/src/Tests/FileListingTest.php b/core/modules/file/src/Tests/FileListingTest.php
index 7828bd0..bef0d5b 100644
--- a/core/modules/file/src/Tests/FileListingTest.php
+++ b/core/modules/file/src/Tests/FileListingTest.php
@@ -4,6 +4,7 @@
 
 use Drupal\node\Entity\Node;
 use Drupal\file\Entity\File;
+use Drupal\entity_test\Entity\EntityTestDefaultValue;
 
 /**
  * Tests file listing page functionality.
@@ -17,7 +18,7 @@ class FileListingTest extends FileFieldTestBase {
    *
    * @var array
    */
-  public static $modules = array('views', 'file', 'image');
+  public static $modules = array('views', 'file', 'image', 'entity_test');
 
   /**
    * An authenticated user.
@@ -145,6 +146,48 @@ function testFileListingPages() {
   }
 
   /**
+   * Tests file listing usage page for entities with no canonical link template.
+   */
+  function testFileListingUsageNoLink() {
+    // Login with user with right permissions and test listing.
+    $this->drupalLogin($this->adminUser);
+
+    // Create a bundle and attach a File field to the bundle.
+    $bundle = $this->randomMachineName();
+    entity_test_create_bundle($bundle, NULL, 'entity_test_default_value');
+    $this->createFileField('field_test_file', 'entity_test_default_value', $bundle, array(), array('file_extensions' => 'txt png'));
+
+    // Create file to attach to entity.
+    $file = File::create([
+      'filename' => 'druplicon.txt',
+      'uri' => 'public://druplicon.txt',
+      'filemime' => 'text/plain',
+    ]);
+    $file->setPermanent();
+    file_put_contents($file->getFileUri(), 'hello world');
+    $file->save();
+
+    // Create entity and attach the created file.
+    $entity_name = $this->randomMachineName();
+    $this->entity = EntityTestDefaultValue::create(array(
+      'uid' => 1,
+      'name' => $entity_name,
+      'type' => $bundle,
+      'field_test_file' => array(
+        'target_id' => $file->id(),
+      )
+    ));
+    $this->entity->save();
+
+    // Load the file usage page for the created and attached file.
+    $this->drupalGet('admin/content/files/usage/' . $file->id());
+
+    $this->assertResponse(200);
+    // Linked entity name should not be displayed if there is no link template.
+    $this->assertNoLink($entity_name, 'Linked entity not added to usage listing');
+  }
+
+  /**
    * Creates and saves a test file.
    *
    * @return \Drupal\Core\Entity\EntityInterface
diff --git a/core/modules/views/src/Plugin/views/field/EntityLabel.php b/core/modules/views/src/Plugin/views/field/EntityLabel.php
index 3691d06..d2b3c59 100644
--- a/core/modules/views/src/Plugin/views/field/EntityLabel.php
+++ b/core/modules/views/src/Plugin/views/field/EntityLabel.php
@@ -104,7 +104,7 @@ public function render(ResultRow $values) {
     /** @var $entity \Drupal\Core\Entity\EntityInterface */
     $entity = $this->loadedReferencers[$type][$value];
 
-    if (!empty($this->options['link_to_entity'])) {
+    if (!empty($this->options['link_to_entity']) && $entity->hasLinkTemplate('canonical')) {
       $this->options['alter']['make_link'] = TRUE;
       $this->options['alter']['url'] = $entity->urlInfo();
     }