diff --git a/backport-changelog/6.8/8123.md b/backport-changelog/6.8/8123.md
index ec1b9f28f6f73d..bef3b35833001e 100644
--- a/backport-changelog/6.8/8123.md
+++ b/backport-changelog/6.8/8123.md
@@ -3,3 +3,4 @@ https://github.com/WordPress/wordpress-develop/pull/8123
 * https://github.com/WordPress/gutenberg/pull/68549
 * https://github.com/WordPress/gutenberg/pull/68745
 * https://github.com/WordPress/gutenberg/pull/69160
+* https://github.com/WordPress/gutenberg/pull/69209
diff --git a/lib/compat/wordpress-6.8/post.php b/lib/compat/wordpress-6.8/post.php
index b205e9dc81b894..344cd7e311d0f9 100644
--- a/lib/compat/wordpress-6.8/post.php
+++ b/lib/compat/wordpress-6.8/post.php
@@ -12,7 +12,7 @@ function gutenberg_update_page_editor_support() {
 		return;
 	}
 
-	if ( wp_is_block_theme() ) {
+	if ( wp_is_block_theme() && current_theme_supports( 'block-templates' ) ) {
 		add_post_type_support( 'page', 'editor', array( 'default-mode' => 'template-locked' ) );
 	}
 }