diff --git a/evennia/utils/text2html.py b/evennia/utils/text2html.py
index 011d6efb34..33d1a48ff3 100644
--- a/evennia/utils/text2html.py
+++ b/evennia/utils/text2html.py
@@ -9,7 +9,7 @@ snippet #577349 on http://code.activestate.com.
 """
 
 import re
-import cgi
+from html import escape as html_escape
 from .ansi import *
 
 
@@ -304,7 +304,7 @@ class TextToHTMLparser(object):
         """
         cdict = match.groupdict()
         if cdict["htmlchars"]:
-            return cgi.escape(cdict["htmlchars"])
+            return html_escape(cdict["htmlchars"])
         elif cdict["lineend"]:
             return "<br>"
         elif cdict["firstspace"]: