diff --git a/wp-includes/block-supports/typography.php b/wp-includes/block-supports/typography.php
index bd91bcfe76..9d947088e2 100644
--- a/wp-includes/block-supports/typography.php
+++ b/wp-includes/block-supports/typography.php
@@ -57,6 +57,12 @@ function wp_register_typography_support( $block_type ) {
 			'type' => 'string',
 		);
 	}
+
+	if ( $has_font_family_support && ! array_key_exists( 'fontFamily', $block_type->attributes ) ) {
+		$block_type->attributes['fontFamily'] = array(
+			'type' => 'string',
+		);
+	}
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c5bbfcd74b..357aab4108 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-beta2-54386';
+$wp_version = '6.1-beta2-54387';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.