diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 482f084821..993c3af50e 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -582,7 +582,7 @@ function wpautop( $pee, $br = true ) {
 	$pee = preg_replace( '#(<(' . $allblocksexceptp . ')[^>]*>)(((?!<p>|</\2>).)*)</p>#s', '$1$3', $pee );
 
 	// If an opening <p> tag is inside a block element tag, without a following closing <p> tag, remove it.
-	$pee = preg_replace( '#<p>(((?!</p>).)*</' . $allblocksexceptp . '>)#s', '$1', $pee );
+	$pee = preg_replace( '#<p>([^<]*(((?!</p>).)*)</' . $allblocksexceptp . '>)#s', '$1', $pee );
 
 	// Optionally insert line breaks.
 	if ( $br ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 74dd243ba7..aca2ea5287 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-45586';
+$wp_version = '5.3-alpha-45587';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.