diff --git a/Check/Content/FieldInstances.php b/Check/Content/FieldInstances.php
index 1e26e61..c774f3f 100644
--- a/Check/Content/FieldInstances.php
+++ b/Check/Content/FieldInstances.php
@@ -103,9 +103,11 @@ class SiteAuditCheckContentFieldInstances extends SiteAuditCheckAbstract {
           continue;
         }
         foreach ($description['bundles'] as $bundle) {
-          $query = \Drupal::entityQuery($entity)
-            ->condition($bundle_column_name, $bundle)
-            ->exists($field)
+          $query = \Drupal::entityQuery($entity);
+          if (!empty($bundle_column_name)) {
+            $query->condition($bundle_column_name, $bundle);
+          }
+          $query->exists($field)
             ->count();
           $field_count = $query->execute();
           $this->registry['field_instance_counts'][$bundle][$entity][$field] = $field_count;
