diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 5cc50c825b..67a211df0a 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -454,6 +454,7 @@ class bbcode
 				$code = str_replace("\t", '   ', $code);
 				$code = str_replace('  ', '  ', $code);
 				$code = str_replace('  ', '  ', $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');