diff --git a/wp-includes/theme-templates.php b/wp-includes/theme-templates.php
index d18575099c..e837a2fad5 100644
--- a/wp-includes/theme-templates.php
+++ b/wp-includes/theme-templates.php
@@ -211,7 +211,7 @@ function the_block_template_skip_link() {
  * @since 5.8.0
  */
 function wp_enable_block_templates() {
-	if ( WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if ( wp_is_block_theme() || WP_Theme_JSON_Resolver::theme_has_support() ) {
 		add_theme_support( 'block-templates' );
 	}
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 59e6375c80..28d80abe8b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-beta2-52346';
+$wp_version = '5.9-beta2-52347';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.