diff --git a/commands/runserver/d7-rs-router.php b/commands/runserver/d7-rs-router.php
index c82e05bfd2..26095de8b9 100644
--- a/commands/runserver/d7-rs-router.php
+++ b/commands/runserver/d7-rs-router.php
@@ -46,7 +46,7 @@ function runserver_env($key) {
 }
 
 $url = parse_url($_SERVER["REQUEST_URI"]);
-if (file_exists('.' . $url['path'])) {
+if (file_exists('.' . urldecode($url['path']))) {
   // Serve the requested resource as-is.
   return FALSE;
 }
diff --git a/commands/runserver/d8-rs-router.php b/commands/runserver/d8-rs-router.php
index d04d41d528..0b0a575cc0 100644
--- a/commands/runserver/d8-rs-router.php
+++ b/commands/runserver/d8-rs-router.php
@@ -46,7 +46,7 @@ function runserver_env($key) {
 }
 
 $url = parse_url($_SERVER["REQUEST_URI"]);
-if (file_exists('.' . $url['path'])) {
+if (file_exists('.' . urldecode($url['path']))) {
   // Serve the requested resource as-is.
   return FALSE;
 }