diff --git a/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts b/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts
index ca41e1ed138..cd067450c00 100644
--- a/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts
+++ b/packages/cli-kit/src/public/node/vendor/dev_server/dev-server-2024.ts
@@ -25,15 +25,19 @@ function host(projectName: string, options: HostOptions = {}): string {
 
   const prefix = (options.nonstandardHostPrefix || projectName).replace(/_/g, '-')
 
-  if (projectName === 'shopify') {
-    if (prefix.endsWith('-dev-api')) {
-      const shopName = prefix.replace('-dev-api', '')
-      return `${shopName}.dev-api.shop.dev`
-    }
-    if (!NON_SHOP_PREFIXES.includes(prefix)) {
-      return `${prefix}.my.shop.dev`
-    }
+  if (projectName !== 'shopify') {
+    return `${prefix}.shop.dev`
   }
+
+  if (prefix.endsWith('-dev-api')) {
+    const shopName = prefix.replace('-dev-api', '')
+    return `${shopName}.dev-api.shop.dev`
+  }
+
+  if (!NON_SHOP_PREFIXES.includes(prefix)) {
+    return `${prefix}.my.shop.dev`
+  }
+
   return `${prefix}.shop.dev`
 }