diff --git a/bot/server.py b/bot/server.py
index 012b2bb..0a77819 100644
--- a/bot/server.py
+++ b/bot/server.py
@@ -9,9 +9,9 @@ from emoji import emojize
 
 
 def escape_html(message):
-    return re.sub("&", "&",
+    return re.sub("<", "&lt;",
                   re.sub(">", "&rt;",
-                         re.sub("<", "&lt;", message)))
+                         re.sub("&", "&amp;", message)))
 
 
 def get(db):