diff --git a/judge/jinja2/markdown/__init__.py b/judge/jinja2/markdown/__init__.py
index 3387ddf..e22ae61 100644
--- a/judge/jinja2/markdown/__init__.py
+++ b/judge/jinja2/markdown/__init__.py
@@ -5,7 +5,7 @@ from urllib.parse import urlparse
 
 import mistune
 from django.conf import settings
-from jinja2 import Markup
+from markupsafe import Markup
 from lxml import html
 from lxml.etree import ParserError, XMLSyntaxError
 
diff --git a/judge/jinja2/spaceless.py b/judge/jinja2/spaceless.py
index 0644e89..01eb5d8 100644
--- a/judge/jinja2/spaceless.py
+++ b/judge/jinja2/spaceless.py
@@ -1,7 +1,8 @@
 import re
 
-from jinja2 import Markup, nodes
+from jinja2 import nodes
 from jinja2.ext import Extension
+from markupsafe import Markup
 
 
 class SpacelessExtension(Extension):