diff --git a/wp-includes/update.php b/wp-includes/update.php
index 412b826057..77f801f301 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -173,7 +173,8 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 		return;
 	}
 
-	$offers = $body['offers'];
+	$offers          = $body['offers'];
+	$has_auto_update = false;
 
 	foreach ( $offers as &$offer ) {
 		foreach ( $offer as $offer_key => $value ) {
@@ -207,6 +208,10 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 				), ''
 			)
 		);
+
+		if ( 'autoupdate' == $offer->response ) {
+			$has_auto_update = true;
+		}
 	}
 
 	$updates                  = new stdClass();
@@ -229,8 +234,13 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 	}
 
 	// Trigger background updates if running non-interactively, and we weren't called from the update handler.
-	if ( $doing_cron && ! doing_action( 'wp_maybe_auto_update' ) ) {
-		do_action( 'wp_maybe_auto_update' );
+	if ( $doing_cron && $has_auto_update && ! doing_action( 'wp_maybe_auto_update' ) ) {
+		include_once( ABSPATH . '/wp-admin/includes/update.php' );
+
+		// Only trigger background updates if an acceptable autoupdate is on offer, avoids needless extra API calls.
+		if ( find_core_auto_update() ) {
+			do_action( 'wp_maybe_auto_update' );
+		}
 	}
 }
 
@@ -287,7 +297,7 @@ function wp_update_plugins( $extra_stats = array() ) {
 			break;
 		default:
 			if ( $doing_cron ) {
-				$timeout = 0;
+				$timeout = 2 * HOUR_IN_SECONDS;
 			} else {
 				$timeout = 12 * HOUR_IN_SECONDS;
 			}
@@ -474,7 +484,11 @@ function wp_update_themes( $extra_stats = array() ) {
 			$timeout = HOUR_IN_SECONDS;
 			break;
 		default:
-			$timeout = $doing_cron ? 0 : 12 * HOUR_IN_SECONDS;
+			if ( $doing_cron ) {
+				$timeout = 2 * HOUR_IN_SECONDS;
+			} else {
+				$timeout = 12 * HOUR_IN_SECONDS;
+			}
 	}
 
 	$time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time() - $last_update->last_checked );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 28024f2530..ba2ffc092a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42582';
+$wp_version = '5.0-alpha-42584';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.