diff --git a/wp-includes/blocks/template-part.php b/wp-includes/blocks/template-part.php
index 8c01c5a4bc..4332bb305b 100644
--- a/wp-includes/blocks/template-part.php
+++ b/wp-includes/blocks/template-part.php
@@ -157,7 +157,7 @@ function render_block_core_template_part( $attributes ) {
 	global $wp_embed;
 	$content = $wp_embed->autoembed( $content );
 
-	if ( empty( $attributes['tagName'] ) ) {
+	if ( empty( $attributes['tagName'] ) || tag_escape( $attributes['tagName'] ) !== $attributes['tagName'] ) {
 		$area_tag = 'div';
 		if ( $area_definition && isset( $area_definition['area_tag'] ) ) {
 			$area_tag = $area_definition['area_tag'];
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d43cecce57..6931f49357 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5.5-alpha-58474';
+$wp_version = '6.5.5-alpha-58477';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.