diff --git a/wp-includes/media.php b/wp-includes/media.php
index 4f1eed831f..c25ac99ed9 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -2250,7 +2250,16 @@ function gallery_shortcode( $attr ) {
 	if ( is_feed() ) {
 		$output = "\n";
 		foreach ( $attachments as $att_id => $attachment ) {
-			$output .= wp_get_attachment_link( $att_id, $atts['size'], true ) . "\n";
+			if ( ! empty( $atts['link'] ) ) {
+				if ( 'none' === $atts['link'] ) {
+					$output .= wp_get_attachment_image( $att_id, $atts['size'], false, $attr );
+				} else {
+					$output .= wp_get_attachment_link( $att_id, $atts['size'], false );
+				}
+			} else {
+				$output .= wp_get_attachment_link( $att_id, $atts['size'], true );
+			}
+			$output .= "\n";
 		}
 		return $output;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f2751eec83..df9ef47882 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta2-48495';
+$wp_version = '5.5-beta2-48496';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.