diff --git a/wp-includes/block-editor.php b/wp-includes/block-editor.php
index ffa83229dc..d2bf4cee7d 100644
--- a/wp-includes/block-editor.php
+++ b/wp-includes/block-editor.php
@@ -470,12 +470,17 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont
 function get_block_editor_theme_styles() {
 	global $editor_styles;
 
-	$styles = array(
-		array(
-			'css'            => 'body { font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif }',
-			'__unstableType' => 'core',
-		),
-	);
+	if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) {
+		$styles = array(
+			array(
+				'css'            => 'body { font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif }',
+				'__unstableType' => 'core',
+			),
+		);
+	} else {
+		$styles = array();
+	}
+
 	if ( $editor_styles && current_theme_supports( 'editor-styles' ) ) {
 		foreach ( $editor_styles as $style ) {
 			if ( preg_match( '~^(https?:)?//~', $style ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0992c6ed06..4631890258 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-beta3-51239';
+$wp_version = '5.8-beta3-51240';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.