diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index e5622d14b..a3d26a736 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -2052,9 +2052,6 @@ class BBCode extends BaseObject
 			$text = self::convert($text, false, 4);
 		}
 
-		// mask some special HTML chars from conversation to markdown
-		$text = str_replace(['<', '>', '&'], ['&_lt_;', '&_gt_;', '&_amp_;'], $text);
-
 		// If a link is followed by a quote then there should be a newline before it
 		// Maybe we should make this newline at every time before a quote.
 		$text = str_replace(['</a><blockquote>'], ['</a><br><blockquote>'], $text);
@@ -2064,9 +2061,6 @@ class BBCode extends BaseObject
 		// Now convert HTML to Markdown
 		$text = HTML::toMarkdown($text);
 
-		// unmask the special chars back to HTML
-		$text = str_replace(['&\_lt\_;', '&\_gt\_;', '&\_amp\_;'], ['&lt;', '&gt;', '&amp;'], $text);
-
 		$a->getProfiler()->saveTimestamp($stamp1, "parser", System::callstack());
 
 		// Libertree has a problem with escaped hashtags.