diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index 084228e27f..657e8d0fcf 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -71,7 +71,7 @@ function wp_underscore_video_template() {
 	}
 
 	if ( h ) {
-		h_rule = ' height: ' + h + 'px;';
+		h_rule = ' height: auto';
 	}
 #>
 <div style="max-width: 100%;{{ w_rule }}{{ h_rule }}">
@@ -297,7 +297,7 @@ function wp_print_media_templates() {
 						w_rule = ' width: ' + wp.media.view.settings.contentWidth + 'px;';
 					}
 					if ( data.height ) {
-						h_rule = ' height: ' + data.height + 'px;';
+						h_rule = ' height: auto';
 					}
 				#>
 				<div style="max-width: 100%; {{ w_rule }}{{ h_rule }}" class="wp-media-wrapper">
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 09853648de..8a82beb974 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1880,6 +1880,8 @@ function wp_video_shortcode( $attr, $content = '' ) {
 	}
 	if ( ! empty( $atts['height'] ) ) {
 		$height_rule = sprintf( ' height: %dpx;', $atts['height'] );
+	} else {
+		$height_rule = ' height: auto;';
 	}
 	$output = sprintf( '<div style="max-width: 100%%;%s%s" class="wp-video">%s</div>', $width_rule, $height_rule, $html );