diff --git a/entity_browser.views.inc b/entity_browser.views.inc
index ab65aca..a026adc 100644
--- a/entity_browser.views.inc
+++ b/entity_browser.views.inc
@@ -6,21 +6,36 @@
  */
 
 /**
-* Implements hook_views_data_alter().
-*/
+ * Implements hook_views_data_alter().
+ */
 function entity_browser_views_data_alter(&$data) {
   $entity_manager = \Drupal::entityManager();
   foreach ($entity_manager->getDefinitions() as $entity_type_name => $entity_type) {
     if (!empty($data[$entity_type->getBaseTable()])) {
       $entity_keys = $entity_type->get('entity_keys');
-      $data[$entity_type->getBaseTable()]['entity_browser_select'] = [
-        'title' => t('Entity browser bulk select form'),
-        'help' => t('Add a form element that lets you use a view as a base to select entities in entity browser.'),
-        'field' => [
-          'id' => 'entity_browser_select',
-          'real field' => $entity_keys['id'],
-        ],
-      ];
+
+      if ($base_table = $entity_type->getBaseTable()) {
+        $data[$base_table]['entity_browser_select'] = [
+          'title' => t('Entity browser bulk select form'),
+          'help' => t('Add a form element that lets you use a view as a base to select entities in entity browser.'),
+          'field' => [
+            'id' => 'entity_browser_select',
+            'real field' => $entity_keys['id'],
+          ],
+        ];
+      }
+
+      if ($data_table = $entity_type->getDataTable()) {
+        $data[$data_table]['entity_browser_select'] = [
+          'title' => t('Entity browser bulk select form'),
+          'help' => t('Add a form element that lets you use a view as a base to select entities in entity browser.'),
+          'field' => [
+            'id' => 'entity_browser_select',
+            'real field' => $entity_keys['id'],
+          ],
+        ];
+      }
+
     }
   }
 }