diff --git a/core/modules/comment/lib/Drupal/comment/CommentRenderController.php b/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
index c614f8e..b5aa221 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentRenderController.php
@@ -29,8 +29,15 @@ public function buildContent(array $entities = array(), $view_mode = 'full', $la
 
     parent::buildContent($entities, $view_mode, $langcode);
 
+    // Collect all nodes and load them at once.
+    $nids = array();
     foreach ($entities as $entity) {
-      $node = node_load($entity->nid);
+      $nids[$entity->nid] = $entity->nid;
+    }
+    $nodes =node_load_multiple($nids);
+
+    foreach ($entities as $entity) {
+      $node = $nodes[$entity->nid];
       if (!$node) {
         throw new \InvalidArgumentException(t('Invalid node for comment.'));
       }