diff -u b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
--- b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
+++ b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
@@ -33,14 +33,8 @@
   public function validate($module) {
     $entities = $this->entityManager->getDefinitions();
     foreach ($entities as $entity_type) {
-      if ($module == $entity_type->getProvider() && is_subclass_of($entity_type->getClass(), 'Drupal\Core\Entity\ContentEntityInterface') && $entity_type->getBaseTable()) {
-        $content = $this->queryFactory->get($entity_type->id())
-          ->accessCheck(FALSE)
-          ->range(0, 1)
-          ->execute();
-        if (!empty($content)) {
-          return FALSE;
-        }
+      if ($module == $entity_type->getProvider() && is_subclass_of($entity_type->getClass(), 'Drupal\Core\Entity\ContentEntityInterface') && $this->entityManager->getStorage($entity_type->id())->hasData()) {
+        return FALSE;
       }
     }
     return TRUE;