diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 78d699d6d4..4d4ea3a70f 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2136,7 +2136,7 @@ function wp_upload_dir( $time = null ) {
 		$url = trailingslashit( $siteurl ) . UPLOADS;
 	}
 
-	if ( is_multisite() ) {
+	if ( is_multisite() && ( WP_CONTENT_DIR . '/uploads' != ABSPATH . $upload_path ) ) {
 		if ( defined( 'BLOGUPLOADDIR' ) )
 			$dir = untrailingslashit(BLOGUPLOADDIR);
 		$url = str_replace( UPLOADS, 'files', $url );