diff --git a/php/elFinderVolumeDropbox.class.php b/php/elFinderVolumeDropbox.class.php
index 3c0dced3e..a4c0a9d1f 100644
--- a/php/elFinderVolumeDropbox.class.php
+++ b/php/elFinderVolumeDropbox.class.php
@@ -226,10 +226,14 @@ class elFinderVolumeDropbox extends elFinderVolumeDriver {
 	 * @param array $options
 	 * @return boolean
 	 */
-	public function netunmount($netVolumes) {
+	public function netunmount($netVolumes, $key) {
 		$count = 0;
+		$dropboxUid = '';
+		if (isset($netVolumes[$key])) {
+			$dropboxUid = $netVolumes[$key]['dropboxUid'];
+		}
 		foreach($netVolumes as $volume) {
-			if ($volume['host'] === 'dropbox') {
+			if (@$volume['host'] === 'dropbox' && @$volume['dropboxUid'] === $dropboxUid) {
 				$count++;
 			}
 		}
@@ -331,9 +335,6 @@ class elFinderVolumeDropbox extends elFinderVolumeDriver {
 			}
 		}
 		
-		// auth ok
-		$_SESSION['elFinderDropboxTokens'] = array($this->options['dropboxUid'], $this->options['accessToken'], $this->options['accessTokenSecret']);
-		
 		$this->dropboxUid = $this->options['dropboxUid'];
 		$this->tmbPrefix = 'dropbox'.base_convert($this->dropboxUid, 10, 32);