diff --git a/file_entity.pages.inc b/file_entity.pages.inc
index a00245a..8873247 100644
--- a/file_entity.pages.inc
+++ b/file_entity.pages.inc
@@ -497,7 +497,7 @@ function file_entity_upload_destination_uri(array $params, array $data = array()
   $destination = trim($params['file_directory'], '/');
 
   // Replace tokens.
-  $destination = token_replace($destination, $data);
+  $destination = decode_entities(token_replace($destination, $data));
 
   return $params['uri_scheme'] . '://' . $destination;
 }