diff --git a/cli/drivers/BedrockValetDriver.php b/cli/drivers/BedrockValetDriver.php
index d166c1ab..870f3d92 100644
--- a/cli/drivers/BedrockValetDriver.php
+++ b/cli/drivers/BedrockValetDriver.php
@@ -49,15 +49,15 @@ public function frontControllerPath($sitePath, $siteName, $uri)
     {
         $this->loadServerEnvironmentVariables($sitePath, $siteName);
 
-        $_SERVER['PHP_SELF'] = $uri;
+        $_SERVER['PHP_SELF']    = $uri;
+        $_SERVER['SERVER_ADDR'] = '127.0.0.1';
+        $_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'];
 
-        if (strpos($uri, '/wp/') === 0) {
-            return is_dir($sitePath.'/web'.$uri)
-                            ? $sitePath.'/web'.$this->forceTrailingSlash($uri).'/index.php'
-                            : $sitePath.'/web'.$uri;
-        }
-
-        return $sitePath.'/web/index.php';
+        return parent::frontControllerPath(
+            $sitePath . '/web',
+            $siteName,
+            $this->forceTrailingSlash($uri)
+        );
     }
 
     /**