diff --git a/wp-includes/block-template-utils.php b/wp-includes/block-template-utils.php
index b1a3172fbb..f4958050c6 100644
--- a/wp-includes/block-template-utils.php
+++ b/wp-includes/block-template-utils.php
@@ -503,7 +503,7 @@ function _build_block_template_result_from_file( $template_file, $template_type
 
 	$template                 = new WP_Block_Template();
 	$template->id             = $theme . '//' . $template_file['slug'];
-	$template->theme          = $theme;
+	$template->theme          = ! empty( $template_file['theme'] ) ? $template_file['theme'] : $theme;
 	$template->content        = _inject_theme_attribute_in_block_template_content( $template_content );
 	$template->slug           = $template_file['slug'];
 	$template->source         = 'theme';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index dab752591f..98754d8c27 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-alpha-54859';
+$wp_version = '6.2-alpha-54860';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.