diff --git a/wp-admin/site-editor.php b/wp-admin/site-editor.php
index dd5211dc0b..9302c42389 100644
--- a/wp-admin/site-editor.php
+++ b/wp-admin/site-editor.php
@@ -120,7 +120,7 @@ wp_enqueue_style( 'wp-format-library' );
 wp_enqueue_media();
 
 if (
-	current_theme_supports( 'wp-block-styles' ) ||
+	current_theme_supports( 'wp-block-styles' ) &&
 	( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
 ) {
 	wp_enqueue_style( 'wp-block-library-theme' );
diff --git a/wp-includes/block-editor.php b/wp-includes/block-editor.php
index acf7b5d550..b42c0c09f0 100644
--- a/wp-includes/block-editor.php
+++ b/wp-includes/block-editor.php
@@ -296,7 +296,7 @@ function get_legacy_widget_block_editor_settings() {
  * }
  */
 function _wp_get_iframed_editor_assets() {
-	global $pagenow;
+	global $pagenow, $editor_styles;
 
 	$script_handles = array(
 		'wp-polyfill',
@@ -305,7 +305,10 @@ function _wp_get_iframed_editor_assets() {
 		'wp-edit-blocks',
 	);
 
-	if ( current_theme_supports( 'wp-block-styles' ) ) {
+	if (
+		current_theme_supports( 'wp-block-styles' ) &&
+		( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
+	) {
 		$style_handles[] = 'wp-block-library-theme';
 	}
 
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 5216ff299a..acdfac640d 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -1635,8 +1635,14 @@ function wp_default_styles( $styles ) {
 		$wp_edit_blocks_dependencies[] = 'wp-editor-classic-layout-styles';
 	}
 
-	if ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 ) {
-		// Include opinionated block styles if no $editor_styles are declared, so the editor never appears broken.
+	if (
+		current_theme_supports( 'wp-block-styles' ) &&
+		( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
+	) {
+		/*
+		 * Include opinionated block styles if the theme supports block styles and
+		 * no $editor_styles are declared, so the editor never appears broken.
+		 */
 		$wp_edit_blocks_dependencies[] = 'wp-block-library-theme';
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index feeb76ac28..eae74933f4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-beta2-55367';
+$wp_version = '6.2-beta2-55368';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.