diff --git a/wp-blog-header.php b/wp-blog-header.php
index 07281dcb2b..47709d4988 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -202,7 +202,15 @@ if (! empty($wp_template)) {
 // Template redirection
 if ($pagenow == 'index.php') {
 	if (! isset($wp_did_template_redirect)) {
-		if (is_home() && 
+		if (is_feed()) {
+			$wp_did_template_redirect = true;
+			include(dirname(__FILE__) . '/wp-feed.php');
+			exit;
+		} else if ($tb == 1) {
+			$wp_did_template_redirect = true;
+			include(dirname(__FILE__) . '/wp-trackback.php');
+			exit;
+		} else if (is_home() && 
 				file_exists(ABSPATH . "wp-content/${wp_template}index.php")) {
 			$wp_did_template_redirect = true;
 			include(ABSPATH . "wp-content/${wp_template}index.php");
@@ -248,14 +256,6 @@ if ($pagenow == 'index.php') {
 			$wp_did_template_redirect = true;
 			include(ABSPATH . "wp-content/${wp_template}404.php");
 			exit;
-		} else if (is_feed()) {
-			$wp_did_template_redirect = true;
-			include(dirname(__FILE__) . '/wp-feed.php');
-			exit;
-		} else if ($tb == 1) {
-			$wp_did_template_redirect = true;
-			include(dirname(__FILE__) . '/wp-trackback.php');
-			exit;
 		} else if (file_exists(ABSPATH . "wp-content/${wp_template}index.php"))
 			{
 				$wp_did_template_redirect = true;