diff --git a/_config.php b/_config.php
index abec1fa3..0e1dcb8f 100644
--- a/_config.php
+++ b/_config.php
@@ -21,7 +21,6 @@ HtmlEditorConfig::get('cms')->setOptions(array(
 	'friendly_name' => 'Default CMS',
 	'priority' => '50',
 	'mode' => 'none',
-	'language' => i18n::get_tinymce_lang(),
 
 	'body_class' => 'typography',
 	'document_base_url' => Director::absoluteBaseURL(),
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 39f87627..fa2f07b5 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -162,6 +162,7 @@ class LeftAndMain extends Controller {
 		// Set default values in the config if missing.  These things can't be defined in the config
 		// file because insufficient information exists when that is being processed
 		$htmlEditorConfig = HtmlEditorConfig::get_active();
+		$htmlEditorConfig->setOption('language', i18n::get_tinymce_lang());
 		if(!$htmlEditorConfig->getOption('content_css')) {
 			$cssFiles = 'cms/css/editor.css';