diff --git a/core/modules/comment/src/CommentViewBuilder.php b/core/modules/comment/src/CommentViewBuilder.php
index 51e9d94..06bd4d5 100644
--- a/core/modules/comment/src/CommentViewBuilder.php
+++ b/core/modules/comment/src/CommentViewBuilder.php
@@ -112,7 +112,7 @@ public function buildComponents(array &$build, array $entities, array $displays,
       $build[$id]['#entity'] = $entity;
       $build[$id]['#theme'] = 'comment__' . $entity->getFieldName() . '__' . $commented_entity->bundle();
 
-      $display = $displays[$commented_entity->bundle()];
+      $display = $displays[$entity->bundle()];
       if ($display->getComponent('links')) {
         $callback = '\Drupal\comment\CommentViewBuilder::renderLinks';
         $context = array(