diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 94b9cfa79c..2f233a4a0f 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -1406,6 +1406,8 @@ class Core_Upgrader extends WP_Upgrader {
 			}
 		}
 
+		do_action( 'upgrader_process_complete', $this, array( 'action' => 'update', 'type' => 'core' ) );
+
 		return $result;
 	}
 
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 3b39b0255b..6481162a2d 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -891,9 +891,6 @@ function update_core($from, $to) {
 	// Remove maintenance file, we're done.
 	$wp_filesystem->delete($maintenance_file);
 
-	// Has to be in here, rather than the Upgrader as the filter below will override and kill the process before themes get updated on major updates
-	do_action( 'upgrader_process_complete', null, array( 'action' => 'update', 'type' => 'core' ) );
-
 	// If we made it this far:
 	do_action( '_core_updated_successfully', $wp_version );