diff --git a/site/src/utils/apps.ts b/site/src/utils/apps.ts
index 29dd275acf..fcb1d42805 100644
--- a/site/src/utils/apps.ts
+++ b/site/src/utils/apps.ts
@@ -29,9 +29,8 @@ export const createAppLinkHref = (
 	}
 
 	if (appsHost && app.subdomain && app.subdomain_name) {
-		const baseUrl = `${protocol}//${appsHost}`;
+		const baseUrl = `${protocol}//${appsHost.replace("*", app.subdomain_name)}`;
 		const url = new URL(baseUrl);
-		url.hostname = appsHost.replace("*", app.subdomain_name);
 		url.pathname = "/";
 
 		href = url.toString();
diff --git a/site/src/utils/portForward.ts b/site/src/utils/portForward.ts
index 97f7628b5e..e9e5a81d39 100644
--- a/site/src/utils/portForward.ts
+++ b/site/src/utils/portForward.ts
@@ -13,9 +13,8 @@ export const portForwardURL = (
 
 	const subdomain = `${port}${suffix}--${agentName}--${workspaceName}--${username}`;
 
-	const baseUrl = `${location.protocol}//${host}`;
+	const baseUrl = `${location.protocol}//${host.replace("*", subdomain)}`;
 	const url = new URL(baseUrl);
-	url.hostname = host.replace("*", subdomain);
 
 	return url.toString();
 };