diff --git a/metatag.module b/metatag.module
index f3cdeaf..9aff90b 100644
--- a/metatag.module
+++ b/metatag.module
@@ -835,11 +835,9 @@ function metatag_entity_view($entity, $entity_type, $view_mode, $langcode, $forc
         $options['language'] = $languages[$langcode];
       }
 
-      // Reload the entity object from cache as it may have been altered.
+      // Include token replacement data
       $token_type = token_get_entity_mapping('entity', $entity_type);
-      $entities = entity_load($entity_type, array($entity_id));
-      $options['token data'][$token_type] = $entities[$entity_id];
-      $options['entity'] = $entities[$entity_id];
+      $options['token data'][$token_type] = $entity;
 
       // Render the metatags and save to the cache.
       $output = metatag_metatags_view($instance, $metatags, $options);
