diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 9968bb8cf2..bd2e5406a6 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -29,6 +29,8 @@ if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
 
 require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
 
+nocache_headers();
+
 if ( get_option('db_upgraded') ) {
 	flush_rewrite_rules();
 	update_option( 'db_upgraded',  false );
@@ -66,8 +68,6 @@ require_once(ABSPATH . 'wp-admin/includes/admin.php');
 
 auth_redirect();
 
-nocache_headers();
-
 // Schedule trash collection
 if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )
 	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 6e5d3b8116..8eaaf5f5b3 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -17,6 +17,8 @@ define( 'WP_INSTALLING', true );
 /** Load WordPress Bootstrap */
 require( '../wp-load.php' );
 
+nocache_headers();
+
 timer_start();
 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );