diff --git a/agaric/templates/field/field--comment.html.twig b/agaric/templates/field/field--comment.html.twig
index 72a1b76..6666c9c 100644
--- a/agaric/templates/field/field--comment.html.twig
+++ b/agaric/templates/field/field--comment.html.twig
@@ -26,7 +26,7 @@
  * @see comment_preprocess_field()
  */
 #}
-{% if comments %}
+{% if comments or comment_form %}
 <section{{ attributes.addClass('section comment-section') }} data-headerbg="light">
   <div class="container">
   {% if not label_hidden %}
@@ -40,13 +40,19 @@
   {% endif %}
   {% if comment_form %}
     <div class="titlebar_links">
-      <a href="#comment-form">Add new comment</a>
+      {% if comments %}
+        <a href="#comment-form">Add new comment</a>
+      {% else %}
+        No comments yet, <a href="#comment-form">be the first</a>!
+      {% endif %}
     </div>
   {% endif %}
 
+  {% if comments %}
     <div class="content">
       {{ comments }}
     </div>
+  {% endif %}
 
   {% if comment_form %}
     <div class="flow content">