diff --git a/core/themes/olivero/templates/content/node.html.twig b/core/themes/olivero/templates/content/node.html.twig
index f642b2c298..5074ac57e8 100644
--- a/core/themes/olivero/templates/content/node.html.twig
+++ b/core/themes/olivero/templates/content/node.html.twig
@@ -101,12 +101,14 @@
     {% endif %}
   </header>
   <div{{ content_attributes.addClass('node__content', layout) }}>
-    {# Comments not part of content, so they won't inherit .text-content styles. #}
-    {{ content|without('comment') }}
+    {% for field_name, field in content %}
+      {% if field_name == 'comment' %}
+        <div id="comments">
+          {{ field }}
+        </div>
+      {% else %}
+        {{ field }}
+      {% endif %}
+    {% endfor %}
   </div>
-  {% if content.comment %}
-    <div id="comments" class="{{ layout }}">
-      {{ content.comment }}
-    </div>
-  {% endif %}
 </article>