diff --git a/framework/core/src/Install/Actions/InstallAction.php b/framework/core/src/Install/Actions/InstallAction.php
index 7205c5a3e..e234fd87b 100644
--- a/framework/core/src/Install/Actions/InstallAction.php
+++ b/framework/core/src/Install/Actions/InstallAction.php
@@ -59,7 +59,7 @@ class InstallAction extends Action
             'email'    => array_get($input, 'adminEmail'),
         ]);
 
-        $baseUrl = rtrim((string) $request->getUri(), '/');
+        $baseUrl = rtrim((string) $request->getAttribute('originalUri'), '/');
 
         $data->setSetting('admin_url', $baseUrl . '/admin');
         $data->setSetting('api_url', $baseUrl . '/api');