diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 6dedd314cf..ee95765bc7 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -108,7 +108,7 @@ class Trashbin {
 		if ( $quota === null || $quota === 'default') {
 			$quota = \OC_Appconfig::getValue('files', 'default_quota');
 		}
-		if ( $quota === null ) {
+		if ( $quota === null || $quote === 'none' ) {
 			$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
 		} else {
 			$quota = \OCP\Util::computerFileSize($quota);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 6ee307c7e1..4194ebc741 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -351,16 +351,16 @@ class Storage {
 			$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
 
 			// get available disk space for user
-			$quota = \OC_Preferences::getValue($uid, 'files', 'quota');
-			if ( $quota === null ) {
+			$quota = \OC_Preferences::getValue($user, 'files', 'quota');
+			if ( $quota === null || $quota === 'default') {
 				$quota = \OC_Appconfig::getValue('files', 'default_quota');
 			}
-			if ( $quota === null ) {
+			if ( $quota === null || $quote === 'none' ) {
 				$quota = \OC\Files\Filesystem::free_space('/') / count(\OCP\User::getUsers());
 			} else {
 				$quota = \OCP\Util::computerFileSize($quota);
 			}
-
+			
 			// make sure that we have the current size of the version history
 			if ( $versionsSize === null ) {
 				$versionsSize = self::getVersionsSize($uid);