diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 41cbc1a8c..ec7cd4b7a 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -141,6 +141,9 @@ function wp_upgrade() {
 	if ( $wp_db_version == $wp_current_db_version )
 		return;
 
+	if(!is_blog_installed())
+		return;
+
 	wp_check_mysql_version();
 	wp_cache_flush();
 	make_db_current_silent();
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index c6c087d89..e26a92e36 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -45,7 +45,7 @@ $step = (int) $step;
 <body>
 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
 
-<?php if ( get_option('db_version') == $wp_db_version ) : ?>
+<?php if ( get_option('db_version') == $wp_db_version || !is_blog_installed()) : ?>
 
 <h2><?php _e('No Upgrade Required'); ?></h2>
 <p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
@@ -92,4 +92,4 @@ endswitch;
 endif;
 ?>
 </body>
-</html>
\ No newline at end of file
+</html>
