diff --git a/wp-includes/query.php b/wp-includes/query.php
index 51ff173fd2..812f630f9c 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -1474,17 +1474,17 @@ class WP_Query {
 			$this->is_home = true;
 
 		// Correct is_* for page_on_front and page_for_posts
-		if (	$this->is_home &&
-				'page' == get_option('show_on_front') && get_option('page_on_front') &&
-				( empty($query) || !array_diff( array_keys($this->query), array('preview', 'page', 'paged', 'cpage') ) )
-				) {
-			$this->is_page = true;
-			$this->is_home = false;
-			$qv['page_id'] = get_option('page_on_front');
-			// Correct <!--nextpage--> for page_on_front
-			if ( !empty($qv['paged']) ) {
-				$qv['page'] = $qv['paged'];
-				unset($qv['paged']);
+		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
+			$_query = wp_parse_args($query);
+			if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
+				$this->is_page = true;
+				$this->is_home = false;
+				$qv['page_id'] = get_option('page_on_front');
+				// Correct <!--nextpage--> for page_on_front
+				if ( !empty($qv['paged']) ) {
+					$qv['page'] = $qv['paged'];
+					unset($qv['paged']);
+				}
 			}
 		}