diff --git a/components/Tag/templates/tag_stream.html.twig b/components/Tag/templates/tag_stream.html.twig
index f990f71208..cca76d24e8 100644
--- a/components/Tag/templates/tag_stream.html.twig
+++ b/components/Tag/templates/tag_stream.html.twig
@@ -1,7 +1,12 @@
-{% for note in notes %}
-  <div>
-    {{ note.getRendered() | raw }}
-  </div>
-{% endfor %}
+{% extends 'base.html.twig' %}
+{% import '/cards/note/view.html.twig' as noteView %}
 
-{{ "Page: " ~ page }}
+{% block body %}
+  {% for note in notes %}
+    {% block current_note %}
+      {{ noteView.macro_note(note) }}
+    {% endblock current_note %}
+  {% endfor %}
+
+  {{ "Page: " ~ page }}
+{% endblock %}
diff --git a/templates/cards/note/view.html.twig b/templates/cards/note/view.html.twig
index dd20af0d95..1763b4df58 100644
--- a/templates/cards/note/view.html.twig
+++ b/templates/cards/note/view.html.twig
@@ -118,4 +118,4 @@
             </section>
         </div>
     </article>
-{% endmacro macro_note_minimal %}
\ No newline at end of file
+{% endmacro macro_note_minimal %}