diff --git a/app/webroot/index.php b/app/webroot/index.php
index 2bf59fd463d..15643e4c6d2 100644
--- a/app/webroot/index.php
+++ b/app/webroot/index.php
@@ -82,7 +82,7 @@
 
 // For the built-in server
 if (PHP_SAPI === 'cli-server') {
-	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
+	if ($_SERVER['PHP_SELF'] !== '/' . basename(__FILE__) && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
 		return false;
 	}
 	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);