diff --git a/wp-admin/site-editor.php b/wp-admin/site-editor.php
index e3f48c2f23..365c6d701e 100644
--- a/wp-admin/site-editor.php
+++ b/wp-admin/site-editor.php
@@ -6,7 +6,7 @@
  * @subpackage Administration
  */
 
-global $post, $editor_styles;
+global $editor_styles;
 
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
@@ -120,7 +120,7 @@ wp_add_inline_script(
 
 wp_add_inline_script(
 	'wp-blocks',
-	sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( $post ) ) ),
+	sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( isset( $editor_settings['blockCategories'] ) ? $editor_settings['blockCategories'] : array() ) ),
 	'after'
 );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3c2d1b84a3..94b2303114 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53783';
+$wp_version = '6.1-alpha-53784';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.