diff --git a/wp-includes/media.php b/wp-includes/media.php
index 05371e04b7..f62bc0b270 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -854,7 +854,7 @@ function wp_audio_shortcode( $attr ) {
 	foreach ( $default_types as $type  )
 		$defaults_atts[$type] = '';
 
-	$atts = shortcode_atts( $defaults_atts, $attr );
+	$atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
 	extract( $atts );
 
 	$primary = false;
@@ -961,7 +961,7 @@ function wp_video_shortcode( $attr ) {
 	foreach ( $default_types as $type  )
 		$defaults_atts[$type] = '';
 
-	$atts = shortcode_atts( $defaults_atts, $attr );
+	$atts = shortcode_atts( $defaults_atts, $attr, 'video' );
 	extract( $atts );
 
 	$primary = false;