diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 3c52b620be010..f0a4bb38ec678 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -288,12 +288,16 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 			// Paragraph
 			$forcenewline = "force_br_newlines : false, force_p_newlines : true, forced_root_block : 'p',";
 		}
+		
+		$ignore_filter = false;
 
 		// Text filtering
 		if ($this->params->get('use_config_textfilters', 0))
 		{
 			// Use filters from com_config
 			$filter = static::getGlobalFilters();
+			
+			$ignore_filter = $filter === false;
 
 			$tagBlacklist  = !empty($filter->tagBlacklist) ? $filter->tagBlacklist : array();
 			$attrBlacklist = !empty($filter->attrBlacklist) ? $filter->attrBlacklist : array();
@@ -845,6 +849,7 @@ public function onDisplay($name, $content, $width, $height, $col, $row, $buttons
 		inline_styles : true,
 		gecko_spellcheck : true,
 		entity_encoding : \"$entity_encoding\",
+		verify_html: " . ($ignore_filter ? 'false' : 'true') . ",
 		$forcenewline
 		$smallButtons
 		";
@@ -1263,6 +1268,7 @@ protected static function getGlobalFilters()
 		if ($unfiltered)
 		{
 			// Dont apply filtering.
+			return false;
 		}
 		else
 		{