@@ -52,8 +52,8 @@ function gutenberg_inject_rtc_compatible_meta_boxes( $wp_meta_boxes ) {
 					}
 
 					$meta_boxes_per_location[ $location ][] = array(
-						'id'                => $meta_box['id'],
-						'title'             => $meta_box['title'],
+						'id'               => $meta_box['id'],
+						'title'            => $meta_box['title'],
 						'__rtc_compatible' => true,
 					);
 				}
 
@@ -21,20 +21,20 @@ export const useMetaBoxInitialization = ( enabled ) => {
 	const {
 		isEnabledAndEditorReady,
 		isCollaborationEnabled,
-		hasMetaBoxes,
-		allMetaBoxes,
+		hasIncompatibleMetaBoxes,
 	} = useSelect(
 		( select ) => ( {
 			isEnabledAndEditorReady:
 				enabled && select( editorStore ).__unstableIsEditorReady(),
 			isCollaborationEnabled:
 				select( editorStore ).isCollaborationEnabledForCurrentPost(),
-			hasMetaBoxes: enabled
-				? select( editPostStore ).hasMetaBoxes()
+			// Meta boxes marked with __rtc_compatible_meta_box on the server
+			// carry an `__rtc_compatible` flag on their store entry.
+			hasIncompatibleMetaBoxes: enabled
+				? select( editPostStore )
+						.getAllMetaBoxes()
+						.some( ( metaBox ) => ! metaBox.__rtc_compatible )
 				: false,
-			allMetaBoxes: enabled
-				? select( editPostStore ).getAllMetaBoxes()
-				: undefined,
 		} ),
 		[ enabled ]
 	);
@@ -48,24 +48,15 @@ export const useMetaBoxInitialization = ( enabled ) => {
 			initializeMetaBoxes();
 
 			// Disable real-time collaboration when legacy meta boxes are detected.
-			// Meta boxes marked with __rtc_compatible_meta_box on the server
-			// carry an `__rtc_compatible` flag on their store entry.
-			if ( isCollaborationEnabled ) {
-				const hasIncompatibleMetaBoxes = allMetaBoxes?.some(
-					( metaBox ) => ! metaBox.__rtc_compatible
-				);
-
-				if ( hasIncompatibleMetaBoxes ) {
-					setCollaborationSupported( false );
-				}
+			if ( isCollaborationEnabled && hasIncompatibleMetaBoxes ) {
+				setCollaborationSupported( false );
 			}
 		}
 	}, [
 		isEnabledAndEditorReady,
 		initializeMetaBoxes,
 		isCollaborationEnabled,
 		setCollaborationSupported,
-		hasMetaBoxes,
-		allMetaBoxes,
+		hasIncompatibleMetaBoxes,
 	] );
 };
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ function gutenberg_inject_rtc_compatible_meta_boxes( $wp_meta_boxes ) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$meta_boxes_per_location[ $location ][] = array(`
`55`		`- 'id' => $meta_box['id'],`
`56`		`- 'title' => $meta_box['title'],`
	`55`	`+ 'id' => $meta_box['id'],`
	`56`	`+ 'title' => $meta_box['title'],`
`57`	`57`	`'__rtc_compatible' => true,`
`58`	`58`	`);`
`59`	`59`	`}`