diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 9c1090f02c..32d6739518 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -3862,6 +3862,9 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 		<?php
 		if ( function_exists( 'wp_robots' ) && function_exists( 'wp_robots_no_robots' ) && function_exists( 'add_filter' ) ) {
 			add_filter( 'wp_robots', 'wp_robots_no_robots' );
+			// Prevent warnings because of $wp_query not existing.
+			remove_filter( 'wp_robots', 'wp_robots_noindex_embeds' );
+			remove_filter( 'wp_robots', 'wp_robots_noindex_search' );
 			wp_robots();
 		}
 		?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d1f85c2c27..506012a27a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.6-beta2-58429';
+$wp_version = '6.6-beta2-58430';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.