diff --git a/wp-includes/query.php b/wp-includes/query.php
index 7d13881c6d..f5ea2838c3 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -546,7 +546,7 @@ class WP_Query {
 			$q['what_to_show'] = 'posts';
 		}
 
-		if ( $this->is_home && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+		if ( $this->is_home && empty($this->query) && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
 			$this->is_page = true;
 			$this->is_home = false;
 			$q['page_id'] = get_option('page_on_front');