diff --git a/wp-includes/media.php b/wp-includes/media.php
index 1ab9a61cfd..48be78e6fc 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1226,6 +1226,10 @@ function wp_playlist_shortcode( $attr ) {
 
 	$id = intval( $atts['id'] );
 
+	if ( $atts['type'] !== 'audio' ) {
+		$atts['type'] = 'video';
+	}
+
 	$args = array(
 		'post_status' => 'inherit',
 		'post_type' => 'attachment',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index af1302a853..53cc56136a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta1-30417';
+$wp_version = '4.1-beta1-30422';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.