diff --git a/wp-includes/class-wp-recovery-mode.php b/wp-includes/class-wp-recovery-mode.php
index 6ac1a09569..fc38afdb54 100644
--- a/wp-includes/class-wp-recovery-mode.php
+++ b/wp-includes/class-wp-recovery-mode.php
@@ -173,6 +173,10 @@ class WP_Recovery_Mode {
 		}
 
 		if ( ! $this->is_active() ) {
+			if ( ! is_protected_endpoint() ) {
+				return new WP_Error( 'non_protected_endpoint', __( 'Error occurred on a non-protected endpoint.' ) );
+			}
+
 			if ( ! function_exists( 'wp_generate_password' ) ) {
 				require_once ABSPATH . WPINC . '/pluggable.php';
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 179bb5e7c7..63ad9cbf2c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-beta3-45237';
+$wp_version = '5.2-beta3-45238';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.