diff --git a/components/Collection/templates/collection/notes.html.twig b/components/Collection/templates/collection/notes.html.twig
index 4cafa25a7f..c8033aeeb3 100644
--- a/components/Collection/templates/collection/notes.html.twig
+++ b/components/Collection/templates/collection/notes.html.twig
@@ -17,7 +17,7 @@
         <header class="feed-header">
             {% set current_path = app.request.get('_route') %}
             {% if page_title is defined %}
-                {% if current_path starts with 'feed_' %}
+                {% if current_path starts with 'feed_' or 'conversation' in current_path %}
                     <h1 class="section-title">{{ page_title | trans }}</h1>
                 {% endif %}
             {% else %}
diff --git a/components/Conversation/Conversation.php b/components/Conversation/Conversation.php
index f2c0c3e2cc..562f2e5753 100644
--- a/components/Conversation/Conversation.php
+++ b/components/Conversation/Conversation.php
@@ -170,6 +170,10 @@ class Conversation extends Component
      */
     public function onAppendCardNote(array $vars, array &$result): bool
     {
+        if (str_contains($vars['request']->getPathInfo(), 'conversation')) {
+            return Event::next;
+        }
+
         // The current Note being rendered
         $note = $vars['note'];
 
diff --git a/templates/cards/blocks/note.html.twig b/templates/cards/blocks/note.html.twig
index 67ba7b7687..c2ffdad38f 100644
--- a/templates/cards/blocks/note.html.twig
+++ b/templates/cards/blocks/note.html.twig
@@ -126,7 +126,7 @@
 {% endblock note_info %}
 
 {% block note_complementary_info %}
-    {% for complementary_info in handle_event('AppendCardNote', {'note': note }) %}
+    {% for complementary_info in handle_event('AppendCardNote', { 'note': note, 'request': app.request }) %}
         <aside title="{{ 'Note\'s complementary information' | trans }}"
                class="note-complementary">
             {% set actor_count = complementary_info['actors'] | length %}