diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index 6eca7ba858..053639baa5 100644
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -99,10 +99,14 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 
 		$sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );
 
-		$editor = WP_Image_Editor::get_instance( $file );
+		if ( $sizes ) {
+			$editor = WP_Image_Editor::get_instance( $file );
 
-		if ( ! is_wp_error( $editor ) )
-			$metadata['sizes'] = $editor->multi_resize( $sizes );
+			if ( ! is_wp_error( $editor ) )
+				$metadata['sizes'] = $editor->multi_resize( $sizes );
+		} else {
+			$metadata['sizes'] = array();
+		}
 
 		// fetch additional metadata from exif/iptc
 		$image_meta = wp_read_image_metadata( $file );