diff --git a/lib/client-assets.php b/lib/client-assets.php
index b2e9fea929c5d..1bc57b656bd96 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -323,8 +323,8 @@ function gutenberg_register_packages_styles( $styles ) {
 	}
 
 	global $editor_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';
 	}