diff --git a/resources/views/yuuno/forum/topic.twig b/resources/views/yuuno/forum/topic.twig
index 8cafe51..b939f0d 100644
--- a/resources/views/yuuno/forum/topic.twig
+++ b/resources/views/yuuno/forum/topic.twig
@@ -224,7 +224,7 @@
 
                             {% if post.poster.signature and post.poster.perms.changeSignature %}
                                 <div class="post__signature bbcode">
-                                    {{ post.poster.signature|raw|nl2br }}
+                                    {{ post.poster.signature()|raw }}
                                 </div>
                             {% endif %}
                         </div>
@@ -270,7 +270,7 @@
 
                         {% if user.signature and user.perms.changeSignature %}
                             <div class="post__signature bbcode">
-                                {{ user.signature|raw|nl2br }}
+                                {{ user.signature()|raw }}
                             </div>
                         {% endif %}
                     </div>
diff --git a/resources/views/yuuno/settings/account/signature.twig b/resources/views/yuuno/settings/account/signature.twig
index fd7f4b0..a0c894f 100644
--- a/resources/views/yuuno/settings/account/signature.twig
+++ b/resources/views/yuuno/settings/account/signature.twig
@@ -7,7 +7,7 @@
 {% endblock %}
 
 {% block settingsContent %}
-    <div class="bbcode" id="settingsPreview" style="max-height: 500px; overflow-y: auto; background: #C2AEEE; box-shadow: inset 0 0 1em 1em #D3BFFF;">{{ user.signature()|raw|nl2br }}</div>
+    <div class="bbcode" id="settingsPreview" style="max-height: 500px; overflow-y: auto; background: #C2AEEE; box-shadow: inset 0 0 1em 1em #D3BFFF;">{{ user.signature()|raw }}</div>
     <hr>
     <form enctype="multipart/form-data" method="post" action="javascript:;" onsubmit="updateSettings(this, '{{ route('settings.account.signature') }}');">
         <input type="hidden" name="session" value="{{ session_id() }}">