diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/MarkdownParser.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/MarkdownParser.java
index b9f5ec1ea..917ecc73f 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/MarkdownParser.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/chat/MarkdownParser.java
@@ -49,14 +49,15 @@ public class MarkdownParser {
     public String renderMarkdown(String markdown, boolean shredLinks) {
         String newMsg = markdown.trim().replaceAll("\n\n\n+", "\n\n\n");
         newMsg = QuoteExtender.matcher(newMsg).replaceAll("$1\n");
-        //Escaping underscores so that URLs with lots of underscores (i.e. wiki links) aren't mangled
-        // Besides, who uses _this_ instead of *this*?
-        newMsg = newMsg.replace("_", "\\_");
 
         //Need to preserve any commands being made
         if(newMsg.startsWith("/"))
             return newMsg;
 
+        //Escaping underscores so that URLs with lots of underscores (i.e. wiki links) aren't mangled
+        // Besides, who uses _this_ instead of *this*?
+        newMsg = newMsg.replace("_", "\\_");
+
 
         if(shredLinks) {
             newMsg = _noHiddenLinksRenderer.render(_markdownParser.parse(newMsg));