diff --git a/CHANGELOG.md b/CHANGELOG.md
index e66177515..21bdfea9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+- [PR-395](https://github.com/itk-dev/os2loop/pull/395)
+  7840: Improved handling of empty step title
 - [PR-394](https://github.com/itk-dev/os2loop/pull/394)
   Made `NGINX_FASTCGI_READ_TIMEOUT` have effect
 
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig
index 1493d7ebf..a3a9a4d2c 100644
--- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig
+++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig
@@ -49,8 +49,6 @@
   ]
 %}
 
-{% set has_title = content.os2loop_documents_step_title['#title'] is not null %}
-
 {% set expanded = app.request.query.get('expanded') %}
 {% set class_collapsed = not expanded ? 'collapsed' %}
 
@@ -61,13 +59,13 @@
       {% if 'print/pdf' in url('<current>')['#markup'] %}
         <span class="{{ class_collapsed }} step--collapse-toggle">
           <span class="bold">
-            {{ has_title ? content.os2loop_documents_step_title : content.os2loop_documents_step_text }}
+            {{ content.os2loop_documents_step_title }}
           </span>
         </span>
       {% else %}
         <a class="{{ class_collapsed }} step--collapse-toggle" type="button" data-toggle="collapse" data-target="#paragraph-id-{{ paragraph.id() }}">
-          <span class="bold {{ has_title ? 'line-clamp-1' }}">
-            {{ has_title ? content.os2loop_documents_step_title : content.os2loop_documents_step_text }}
+          <span class="bold">
+            {{ content.os2loop_documents_step_title }}
           </span>
         </a>
       {% endif %}