diff --git a/base_comment_template/models/comment_template.py b/base_comment_template/models/comment_template.py
index 465e6ddc..9131cca1 100644
--- a/base_comment_template/models/comment_template.py
+++ b/base_comment_template/models/comment_template.py
@@ -39,7 +39,6 @@ class CommentTemplate(models.AbstractModel):
                 ]
             )
             for template in templates:
-                if not template.domain or self in self.search(
-                    safe_eval(template.domain)
-                ):
+                domain = safe_eval(template.domain)
+                if not domain or record.filtered_domain(domain):
                     record.comment_template_ids = [(4, template.id)]