diff --git a/fixteaserlinks.module b/fixteaserlinks.module
index 4e8354a..52e4bf4 100644
--- a/fixteaserlinks.module
+++ b/fixteaserlinks.module
@@ -27,7 +27,11 @@ function fixteaserlinks_node_links_alter(array &$links, NodeInterface $entity, a
   if ('teaser' == $context['view_mode']) {
     if (\Drupal::config('fixteaserlinks.settings')->get('fixteaserlinks_comment')) {
       // remove "add comment" or "log in ... to comment" link from node teaser mode display
-      unset($links['comment__comment']);
+      foreach ($entity->getFieldDefinitions() as $name => $definition) {
+        if ($definition->getType() == 'comment') {
+          unset($links["comment__{$name}"]);
+        }
+      }
     }
     // Get rid of "read more" as well.
     if (\Drupal::config('fixteaserlinks.settings')->get('fixteaserlinks_readmore')) {