diff --git a/templates/_partials/_assignment_info_compact.html.twig b/templates/_partials/_assignment_info_compact.html.twig
index 7663f86..f74b6c6 100644
--- a/templates/_partials/_assignment_info_compact.html.twig
+++ b/templates/_partials/_assignment_info_compact.html.twig
@@ -34,7 +34,7 @@
                 Anmerkungen intern
             </dt>
             <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">
-                {{ assignment.remarks|nl2br|default('-')|raw }}
+                {{ assignment.remarks|default('-')|nl2br }}
             </dd>
         </div>
     </dl>
diff --git a/templates/admin/teamer/skills.html.twig b/templates/admin/teamer/skills.html.twig
index 660e95c..93d19f0 100644
--- a/templates/admin/teamer/skills.html.twig
+++ b/templates/admin/teamer/skills.html.twig
@@ -86,7 +86,7 @@
                                 Wünsche:
                             </div>
                             <div>
-                                {{ teamer.remarks|nl2br|default('-') }}
+                                {{ teamer.remarks|default('-')|nl2br }}
                             </div>
                         </div>
                     </div>
diff --git a/templates/administrative/assignment/detail.html.twig b/templates/administrative/assignment/detail.html.twig
index 4321ee0..952e909 100644
--- a/templates/administrative/assignment/detail.html.twig
+++ b/templates/administrative/assignment/detail.html.twig
@@ -56,7 +56,7 @@
                                     {{ application.pickup|bpn_pickup_label|default('-') }}
                                 </td>
                                 <td>
-                                    {{ application.requests|nl2br|default('-') }}
+                                    {{ application.requests|default('-')|nl2br }}
                                 </td>
                                 <td>
                                     <div class="flex items-center justify-end space-x-2">
@@ -153,7 +153,7 @@
                                 {{ disposition.pickup|bpn_pickup_label }}
                             </td>
                             <td>
-                                {{ disposition.remarks|nl2br|default('-') }}
+                                {{ disposition.remarks|default('-')|nl2br }}
                             </td>
                             <td>
                                 <button type="button"