diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 954a63fea95c1673eda86913d669c8f71e539186..1c343847a4e42f50c15cdb415a62a1b70f83aeb9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 6.x-1.x, xxxx-xx-xx
 ---------------------------
+#373542 by sun: Fixed TinyMCE: entity_encoding 'raw' removes HTML entities.
 #372806 by sun: Fixed block format configuration form element description.
 #367632 by sun: Fixed "Unexpected identifier, string or number" error in IE.
 #367632 by sun: Fixed invalid JavaScript syntax.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index ba6fee07484817738e25feec0f39be640b60f4fb..52e537ad1fff1295aa386f8c8e4ebe9b29a88c0d 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -111,7 +111,6 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
   $init = array(
     'button_tile_map' => TRUE, // @todo Add a setting for this.
     'document_base_url' => base_path(),
-    'entity_encoding' => 'raw',
     'mode' => 'none',
     'plugins' => array(),
     'relative_urls' => FALSE,