diff --git a/lib/class-wp-block-supports.php b/lib/class-wp-block-supports.php
index 45b6bd018920a..47f66d35281b6 100644
--- a/lib/class-wp-block-supports.php
+++ b/lib/class-wp-block-supports.php
@@ -207,9 +207,20 @@ function get_block_wrapper_attributes( $extra_attributes = array() ) {
  * @return array Block attributes.
  */
 function wp_block_supports_track_block_to_render( $args ) {
-	if ( null !== $args['render_callback'] ) {
+	if ( is_callable( $args['render_callback'] ) ) {
 		$block_render_callback   = $args['render_callback'];
-		$args['render_callback'] = function( $attributes, $content, $block ) use ( $block_render_callback ) {
+		$args['render_callback'] = function( $attributes, $content, $block = null ) use ( $block_render_callback ) {
+			// Check for null for back compatibility with WP_Block_Type->render
+			// which is unused since the introduction of WP_Block class.
+			//
+			// See:
+			// - https://core.trac.wordpress.org/ticket/49927
+			// - commit 910de8f6890c87f93359c6f2edc6c27b9a3f3292 at wordpress-develop.
+
+			if ( null === $block ) {
+				return $block_render_callback( $attributes, $content );
+			}
+
 			$parent_block                       = WP_Block_Supports::$block_to_render;
 			WP_Block_Supports::$block_to_render = $block->parsed_block;
 			$result                             = $block_render_callback( $attributes, $content, $block );