diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 292e1c8ca7..3cace16ac7 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -246,8 +246,12 @@ class WP_Query {
 	}
 
 	function set_404() {
+		$is_feed = $this->is_feed;
+
 		$this->init_query_flags();
-		$this->is_404 = true;	
+		$this->is_404 = true;
+
+		$this->is_feed = $is_feed;
 	}
 	
 	function get($query_var) {