diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 80bbe5ea4..8a4655797 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -255,9 +255,9 @@ class HtmlHelper extends AppHelper {
  */
 	function charset($charset = null) {
 		if (is_null($charset)) {
-			$charset = Configure::read('charset');
-			if (is_null($charset)) {
-				$charset = 'utf-8';
+			$charset = Configure::read('App.encoding');
+			if (!$charset) {
+				$charset = 'UTF-8';
 			}
 		}