diff --git a/CTFd/constants/config.py b/CTFd/constants/config.py
index eabba554..9f3194a1 100644
--- a/CTFd/constants/config.py
+++ b/CTFd/constants/config.py
@@ -1,6 +1,5 @@
-from markupsafe import Markup
-
 from CTFd.utils import get_config
+from CTFd.utils.helpers import markup
 
 
 class _ConfigsWrapper:
@@ -9,11 +8,11 @@ class _ConfigsWrapper:
 
     @property
     def theme_header(self):
-        return Markup(get_config("theme_header", default=""))
+        return markup(get_config("theme_header", default=""))
 
     @property
     def theme_footer(self):
-        return Markup(get_config("theme_footer", default=""))
+        return markup(get_config("theme_footer", default=""))
 
 
 Configs = _ConfigsWrapper()
diff --git a/CTFd/constants/plugins.py b/CTFd/constants/plugins.py
index 23c7cdbf..31887469 100644
--- a/CTFd/constants/plugins.py
+++ b/CTFd/constants/plugins.py
@@ -1,7 +1,7 @@
 from flask import current_app
-from markupsafe import Markup
 
 from CTFd.plugins import get_admin_plugin_menu_bar, get_user_page_menu_bar
+from CTFd.utils.helpers import markup
 from CTFd.utils.plugins import get_registered_scripts, get_registered_stylesheets
 
 
@@ -20,7 +20,7 @@ class _PluginWrapper:
                 )
             else:
                 scripts.append(f'<script defer src="{script}"></script>')
-        return Markup("\n".join(scripts))
+        return markup("\n".join(scripts))
 
     @property
     def styles(self):
@@ -40,7 +40,7 @@ class _PluginWrapper:
                 _styles.append(
                     f'<link rel="stylesheet" type="text/css" href="{stylesheet}">'
                 )
-        return Markup("\n".join(_styles))
+        return markup("\n".join(_styles))
 
     @property
     def user_menu_pages(self):