diff --git a/entityreference.module b/entityreference.module
index 99b3520..0a0f750 100644
--- a/entityreference.module
+++ b/entityreference.module
@@ -1188,6 +1188,12 @@ function entityreference_field_formatter_view($entity_type, $entity, $field, $in
           throw new EntityReferenceRecursiveRenderingException(t('Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.', array('@entity_type' => $entity_type, '@entity_id' => $item['target_id'])));
         }
 
+        // If the language code is set to language neutral, then render the
+        // entity using the current content language instead.
+        if ($langcode == LANGUAGE_NONE && !empty($GLOBALS['language_content']->language)) {
+          $langcode = $GLOBALS['language_content']->language;
+        }
+
         $entity = clone $item['entity'];
         unset($entity->content);
         $result[$delta] = entity_view($field['settings']['target_type'], array($item['target_id'] => $entity), $settings['view_mode'], $langcode, FALSE);