diff --git a/django_core/templatetags/html_tags.py b/django_core/templatetags/html_tags.py
index 7b266a7..856c1b3 100644
--- a/django_core/templatetags/html_tags.py
+++ b/django_core/templatetags/html_tags.py
@@ -1,18 +1,18 @@
 from django import template
-from django.utils.html import linebreaks
-from django.utils.safestring import mark_safe
+from django.template.defaultfilters import linebreaks_filter
 from django.utils.six import string_types
 
 
+# from django.utils.html import linebreaks
 register = template.Library()
 
 
 @register.filter
-def linebreaks_safe(value):
+def linebreaks_safe(value, autoescape=True):
     """
     Adds linebreaks only for text that has a newline character.
     """
     if isinstance(value, string_types) and '\n' in value:
-        return mark_safe(linebreaks(value))
+        return linebreaks_filter(value, autoescape=autoescape)
 
     return value