diff --git a/core/modules/views/src/Plugin/views/field/EntityOperations.php b/core/modules/views/src/Plugin/views/field/EntityOperations.php
index 3b3a1f0..79f6f19 100644
--- a/core/modules/views/src/Plugin/views/field/EntityOperations.php
+++ b/core/modules/views/src/Plugin/views/field/EntityOperations.php
@@ -91,12 +91,6 @@ public function buildOptionsForm(&$form, &$form_state) {
    */
   public function render(ResultRow $values) {
     $entity = $this->getEntity($values);
-
-    // Skip rendering if the entity doesn't even have a list builder.
-    if (!$this->entityManager->hasController($entity->getEntityTypeId(), 'list_builder')) {
-      return array();
-    }
-
     $operations = $this->entityManager->getListBuilder($entity->getEntityTypeId())->getOperations($entity);
     if ($this->options['destination']) {
       foreach ($operations as &$operation) {
diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc
index 2ab9eb5..9c64d84 100644
--- a/core/modules/views/views.views.inc
+++ b/core/modules/views/views.views.inc
@@ -137,7 +137,7 @@ function views_views_data() {
       );
     }
 
-    if ($entity_type->getBaseTable()) {
+    if ($entity_type->getBaseTable() && \Drupal::entityManager()->hasController($entity_type_id, 'list_builder')) {
       $data[$entity_type->getBaseTable()]['operations'] = array(
         'field' => array(
           'title' => t('Operations links'),