diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php
index 4c09cddda..e7ab0a4cc 100644
--- a/wp-includes/ms-files.php
+++ b/wp-includes/ms-files.php
@@ -23,7 +23,7 @@ if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_bl
 	die( '404 — File not found.' );
 }
 
-$file = trailingslashit( BLOGUPLOADDIR ) . str_replace( '..', '', $_GET[ 'file' ] );
+$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET[ 'file' ] );
 if ( !is_file( $file ) ) {
 	status_header( 404 );
 	die( '404 — File not found.' );