diff --git a/includes/media.pages.inc b/includes/media.pages.inc
index 0777d31..921d144 100644
--- a/includes/media.pages.inc
+++ b/includes/media.pages.inc
@@ -259,7 +259,7 @@ function media_add_upload_submit($form, &$form_state) {
   // Prepare the file's subdirectory path.
   $directory = '';
   if (!empty($params['file_directory'])) {
-    $directory = $params['file_directory'] . '/';
+    $directory = token_replace($params['file_directory']) . '/';
 
     // If the directory isn't writable, or doesn't exist and can't be created,
     // the upload will fail.