diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index f29a7542a68..f76d4ebb3ec 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -999,7 +999,7 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) {
 function locale_form_comment_form_alter(&$form, &$form_state, $form_id) {
   // If a content type has multilingual support we set the content language as
   // comment language.
-  if (empty($form['language']['#value']) && locale_multilingual_node_type($form['#node']->type)) {
+  if ($form['language']['#value'] == LANGUAGE_NONE && locale_multilingual_node_type($form['#node']->type)) {
     global $language_content;
     $form['language']['#value'] = $language_content->language;
   }