diff --git a/lib/class-wp-theme-json.php b/lib/class-wp-theme-json.php
index 6d9e8eae37d7ca..d662532739e280 100644
--- a/lib/class-wp-theme-json.php
+++ b/lib/class-wp-theme-json.php
@@ -452,16 +452,22 @@ public static function get_blocks_metadata() {
 				isset( $block_type->supports['__experimentalSelector'] ) &&
 				is_array( $block_type->supports['__experimentalSelector'] )
 			) {
-				foreach ( $block_type->supports['__experimentalSelector'] as $key => $selector_data ) {
+				foreach ( $block_type->supports['__experimentalSelector'] as $key => $selector_metadata ) {
+					if (
+						! isset( $selector_metadata['selector'] ) ||
+						! isset( $selector_metadata['attributes'] ) ||
+						! isset( $selector_metadata['title'] )
+					) {
+						continue;
+					}
+
 					self::$blocks_metadata[ $key ] = array(
-						'selector'   => $selector_data['selector'],
+						'selector'   => $selector_metadata['selector'],
+						'title'      => $selector_metadata['title'],
 						'supports'   => $block_supports,
 						'blockName'  => $block_name,
-						'attributes' => $selector_data['attributes'],
+						'attributes' => $selector_metadata['attributes'],
 					);
-					if ( isset( $selector_data['title'] ) ) {
-						self::$blocks_metadata[ $key ]['title'] = $selector_data['title'];
-					}
 				}
 			} else {
 				self::$blocks_metadata[ $block_name ] = array(
@@ -654,7 +660,7 @@ private static function compute_style_properties( &$declarations, $context ) {
 			$value = self::get_property_value( $context['styles'], $metadata['theme_json'] );
 			if ( ! empty( $value ) ) {
 				$kebabcased_name = strtolower( preg_replace( '/(?<!^)[A-Z]/', '-$0', $name ) );
-				$declarations[] = array(
+				$declarations[]  = array(
 					'name'  => $kebabcased_name,
 					'value' => $value,
 				);
diff --git a/lib/global-styles.php b/lib/global-styles.php
index 7efd18b26bae5b..8d7907e54d6c76 100644
--- a/lib/global-styles.php
+++ b/lib/global-styles.php
@@ -422,7 +422,7 @@ function gutenberg_experimental_global_styles_settings( $settings ) {
 	$base = gutenberg_experimental_global_styles_get_core();
 	$base->merge( gutenberg_experimental_global_styles_get_theme() );
 
-	$all  = gutenberg_experimental_global_styles_get_core();
+	$all = gutenberg_experimental_global_styles_get_core();
 	$all->merge( gutenberg_experimental_global_styles_get_theme() );
 	$all->merge( gutenberg_experimental_global_styles_get_user() );