diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php b/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
index 4b64427a56..19c79acb2a 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
@@ -41,7 +41,13 @@
 
 	<?php
 		$content = apply_filters( 'the_content', get_the_content() );
-		$audio = get_media_embedded_in_content( $content, array( 'audio' ) );
+		$audio = false;
+
+		// Only get audio from the content if a playlist isn't present.
+		if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+			$audio = get_media_embedded_in_content( $content, array( 'audio' ) );
+		}
+
 	?>
 
 	<?php if ( '' !== get_the_post_thumbnail() && ! is_single() ) : ?>
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-video.php b/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
index 95abee412a..cfa37554bf 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
@@ -40,7 +40,12 @@
 
 	<?php
 		$content = apply_filters( 'the_content', get_the_content() );
-		$video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
+		$video = false;
+
+		// Only get video from the content if a playlist isn't present.
+		if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+			$video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
+		}
 	?>
 
 	<?php if ( '' !== get_the_post_thumbnail() && ! is_single() && empty( $video ) ) : ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4ac9ed61e4..40853e31cc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-beta2-39145';
+$wp_version = '4.7-beta2-39146';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.