diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 92a455ce26..144dafbb30 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -458,7 +458,7 @@ class bbcode
 				$code = str_replace("\t", '   ', $code);
 				$code = str_replace('  ', '  ', $code);
 				$code = str_replace('  ', '  ', $code);
-				$code = preg_replace(array('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '#&(\#[0-9]+;)#'), array('\1', '&amp;\1'), $code);
+				$code = preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $code);
 		}
 
 		$code = $this->bbcode_tpl('code_open') . $code . $this->bbcode_tpl('code_close');