diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc
index 25c33b7..1c72b16 100644
--- a/core/modules/comment/comment.views.inc
+++ b/core/modules/comment/comment.views.inc
@@ -386,7 +386,7 @@ function comment_views_data() {
 
   // Provide a relationship for each entity type except comment.
   foreach ($entities_types as $type => $entity_type) {
-    if ($type == 'comment' || !$entity_type->isFieldable() || !$entity_type->getBaseTable()) {
+    if ($type == 'comment' || !$entity_type->isSubclassOf('\Drupal\Core\Entity\ContentEntityInterface') || !$entity_type->getBaseTable()) {
       continue;
     }
     if ($fields = \Drupal::service('comment.manager')->getFields($type)) {
@@ -465,7 +465,7 @@ function comment_views_data() {
 
   // Provide a relationship for each entity type except comment.
   foreach ($entities_types as $type => $entity_type) {
-    if ($type == 'comment' || !$entity_type->isFieldable() || !$entity_type->getBaseTable()) {
+    if ($type == 'comment' || !$entity_type->isSubclassOf('\Drupal\Core\Entity\ContentEntityInterface') || !$entity_type->getBaseTable()) {
       continue;
     }
     // This relationship does not use the 'field id' column, if the entity has
diff --git a/core/modules/comment/src/CommentStorage.php b/core/modules/comment/src/CommentStorage.php
index c7afa0f..7a27c06 100644
--- a/core/modules/comment/src/CommentStorage.php
+++ b/core/modules/comment/src/CommentStorage.php
@@ -25,6 +25,7 @@
  */
 class CommentStorage extends SqlContentEntityStorage implements CommentStorageInterface {
 
+
   /**
    * The current user.
    *
@@ -372,4 +373,6 @@ public function getUnpublishedCount() {
       ->fetchField();
   }
 
+  public function updateEntityStatistics(CommentInterface $comment) {}
+
 }