diff --git a/inc/functions.php b/inc/functions.php
index a6fd35c7..e57fd32a 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1623,7 +1623,7 @@ function markup(&$body, $track_cites = false) {
 }
 
 function escape_markup_modifiers($string) {
-	return preg_replace('@<tinyboard ([\w\s]+)>@m', '<tinyboard escape $1>', $string);
+	return preg_replace('@<tinyboard ([\w\s]+)>(.+)</tinyboard>@m', '<tinyboard escape $1>$2</tinyboard>', $string);
 }
 
 function utf8tohtml($utf8) {