diff --git a/src/Extensions/CommentsExtension.php b/src/Extensions/CommentsExtension.php
index e1e5623..0a2132c 100644
--- a/src/Extensions/CommentsExtension.php
+++ b/src/Extensions/CommentsExtension.php
@@ -254,7 +254,10 @@ class CommentsExtension extends DataExtension
     {
         $order = $this->owner->getCommentsOption('order_comments_by');
         $comments = Comment::get()
-            ->filter('ParentID', $this->owner->ID)
+            ->filter([
+                'ParentID' => $this->owner->ID,
+                'ParentClass' => $this->owner->ClassName,
+            ])
             ->sort($order);
         $this->owner->extend('updateAllComments', $comments);
         return $comments;