diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index caed835506..9fa3b22c26 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -171,6 +171,9 @@ function upgrade_all() {
 			$wp_current_db_version = 2541;
 	}
 
+	if ( $wp_current_db_version < 6039 )
+		upgrade_230_options_table();
+
 	populate_options();
 
 	if ( $wp_current_db_version < 2541 ) {
@@ -192,9 +195,6 @@ function upgrade_all() {
 	if ( $wp_current_db_version < 5539 )
 		upgrade_230();
 
-	if ( $wp_current_db_version < 6039 )
-		upgrade_230_options_table();
-
 	maybe_disable_automattic_widgets();
 
 	$wp_rewrite->flush_rules();