diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index ae7e75dd93..b7f1c7367b 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -347,6 +347,9 @@ function is_upload_space_available() {
  */
 function upload_size_limit_filter( $size ) {
 	$fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
+	if ( get_site_option( 'upload_space_check_disabled' ) )
+		return min( $size, $fileupload_maxk );
+		
 	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }
 /**