diff --git a/core/modules/views/src/ViewsConfigUpdater.php b/core/modules/views/src/ViewsConfigUpdater.php
index 39007783e69..88442d46ddc 100644
--- a/core/modules/views/src/ViewsConfigUpdater.php
+++ b/core/modules/views/src/ViewsConfigUpdater.php
@@ -8,6 +8,7 @@ use Drupal\Core\Config\TypedConfigManagerInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Entity\Sql\DefaultTableMapping;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -343,7 +344,7 @@ class ViewsConfigUpdater implements ContainerInjectionInterface {
       $table_info = [];
 
       foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
-        if ($entity_type->hasHandlerClass('views_data')) {
+        if ($entity_type->hasHandlerClass('views_data') && $entity_type->entityClassImplements(FieldableEntityInterface::class)) {
           $base_field_definitions = $this->entityFieldManager->getBaseFieldDefinitions($entity_type_id);
 
           $entity_storage = $this->entityTypeManager->getStorage($entity_type_id);
diff --git a/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml b/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml
new file mode 100644
index 00000000000..8ea57d87597
--- /dev/null
+++ b/core/modules/views/tests/modules/views_config_entity_test/config/schema/views_config_entity_test.schema.yml
@@ -0,0 +1,9 @@
+views_config_entity_test.type.*:
+  type: config_entity
+  label: 'Config entity type with Views data'
+  mapping:
+    id:
+      type: string
+    name:
+      type: label
+      label: 'Name'
diff --git a/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php b/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php
new file mode 100644
index 00000000000..2649e76ad4e
--- /dev/null
+++ b/core/modules/views/tests/modules/views_config_entity_test/src/Entity/ViewsConfigEntityTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\views_config_entity_test\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBase;
+
+/**
+ * Defines a configuration-based entity type used for testing Views data.
+ *
+ * @ConfigEntityType(
+ *   id = "views_config_entity_test",
+ *   label = @Translation("Test config entity type with Views data"),
+ *   handlers = {
+ *     "list_builder" = "Drupal\Core\Entity\EntityListBuilder",
+ *     "views_data" = "Drupal\views_config_entity_test\ViewsConfigEntityTestViewsData"
+ *   },
+ *   admin_permission = "administer modules",
+ *   config_prefix = "type",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "name"
+ *   }
+ * )
+ */
+class ViewsConfigEntityTest extends ConfigEntityBase {
+}
diff --git a/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php b/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
new file mode 100644
index 00000000000..97138f1c404
--- /dev/null
+++ b/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\views_config_entity_test;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\views\EntityViewsDataInterface;
+
+/**
+ * Provides a view to override views data for config test entity types.
+ */
+class ViewsConfigEntityTestViewsData implements EntityViewsDataInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getViewsData() {
+    return [];
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function getViewsTableForEntityType(EntityTypeInterface $entity_type) {
+    return 'views_config_entity_test';
+  }
+
+}
diff --git a/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml b/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml
new file mode 100644
index 00000000000..95962a12625
--- /dev/null
+++ b/core/modules/views/tests/modules/views_config_entity_test/views_config_entity_test.info.yml
@@ -0,0 +1,5 @@
+name: 'views_config_entity_test'
+description: 'Adds a Config Entity with views data'
+type: module
+package: Testing
+version: VERSION
diff --git a/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php b/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
index 30fb1e8a9d8..9a94a0de253 100644
--- a/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
+++ b/core/modules/views/tests/src/Kernel/ViewsConfigUpdaterTest.php
@@ -20,6 +20,11 @@ class ViewsConfigUpdaterTest extends ViewsKernelTestBase {
    */
   protected $configUpdater;
 
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['views_config_entity_test'];
+
   /**
    * {@inheritdoc}
    */