diff --git includes/file.inc includes/file.inc
index 4f7a4c3..37997e2 100644
--- includes/file.inc
+++ includes/file.inc
@@ -2361,6 +2361,10 @@ function file_directory_temp() {
       // If no directory has been found default to 'files/tmp' or 'files\\tmp'.
       $temporary_directory = variable_get('file_public_path', conf_path() . '/files') . $path_delimiter . 'tmp';
     }
+    else {
+      $unique_key = substr(drupal_hmac_base64('file_directory_temp', drupal_get_hash_salt()), 0, 8);
+      $temporary_directory .= $path_delimeter . 'drupal-' . $unique_key;
+    }
     // Save the path of the discovered directory.
     variable_set('file_temporary_path', $temporary_directory);
   }