diff --git a/src/install.js b/src/install.js
index 34ba776f4f..6365e561cf 100644
--- a/src/install.js
+++ b/src/install.js
@@ -178,8 +178,12 @@ function completeConfigSetup(config, next) {
 			if (urlObj.port) {
 				config.port = urlObj.port;
 			}
-			urlObj.pathname = null;
-			urlObj.path = null;
+
+			// Remove trailing slash from non-subfolder installs
+			if (urlObj.path === '/') {
+				urlObj.path = '';
+				urlObj.pathname = '';
+			}
 
 			config.url = url.format(urlObj);