diff --git a/wp-blog-header.php b/wp-blog-header.php
index ccb1992d8..79b1b28ff 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -14,7 +14,7 @@ $query_vars = array();
 if ((isset($_GET['error']) && $_GET['error'] == '404') ||
 		((! empty($_SERVER['PATH_INFO'])) &&
 		('/' != $_SERVER['PATH_INFO']) &&
-		(false === strpos($_SERVER['PATH_INFO'], $_SERVER['PHP_SELF']))
+		 (false === strpos($_SERVER['PATH_INFO'], 'index.php'))
 		)) {
 
 	// If we match a rewrite rule, this will be cleared.