diff --git a/wp-includes/class-wp-fatal-error-handler.php b/wp-includes/class-wp-fatal-error-handler.php
index 412e1299f4..5a24793124 100644
--- a/wp-includes/class-wp-fatal-error-handler.php
+++ b/wp-includes/class-wp-fatal-error-handler.php
@@ -182,7 +182,7 @@ class WP_Fatal_Error_Handler {
 
 		if ( true === $handled && wp_is_recovery_mode() ) {
 			$message = __( 'There has been a critical error on this website, putting it in recovery mode. Please check the Themes and Plugins screens for more details. If you just installed or updated a theme or plugin, check the relevant page for that first.' );
-		} elseif ( is_protected_endpoint() ) {
+		} elseif ( is_protected_endpoint() && wp_recovery_mode()->is_initialized() ) {
 			$message = __( 'There has been a critical error on this website. Please check your site admin email inbox for instructions.' );
 		} else {
 			$message = __( 'There has been a critical error on this website.' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9ac6b2ea19..35e764f62e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-alpha-51075';
+$wp_version = '5.8-alpha-51076';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.