diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 7995707f95..46c1b3219f 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -767,7 +767,7 @@ class WP_Rewrite {
 		global $wpdb;
 
 		//get pages in order of hierarchy, i.e. children after parents
-		$posts = get_page_hierarchy($wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page'"));
+		$posts = get_page_hierarchy( $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'") );
 
 		// If we have no pages get out quick
 		if ( !$posts )