diff --git a/Composer/packages/server/src/models/connector/selfHostConnector.ts b/Composer/packages/server/src/models/connector/selfHostConnector.ts
index a370fcbb57..49af93880c 100644
--- a/Composer/packages/server/src/models/connector/selfHostConnector.ts
+++ b/Composer/packages/server/src/models/connector/selfHostConnector.ts
@@ -48,7 +48,7 @@ export class SelfHostBotConnector implements IBotConnector {
   public connect = async (env: BotEnvironments, hostName: string) => {
     this.status = BotStatus.Connected;
     const prefix = env === 'production' ? '' : 'integration/';
-    const root = hostName ? `https://${hostName}` : absHostRoot;
+    const root = hostName && hostName !== `localhost` ? `https://${hostName}` : absHostRoot;
 
     return Promise.resolve(`${root}/api/${prefix}messages`);
   };
diff --git a/Composer/packages/server/src/settings/env.ts b/Composer/packages/server/src/settings/env.ts
index 05ebdfa285..0fe13fe621 100644
--- a/Composer/packages/server/src/settings/env.ts
+++ b/Composer/packages/server/src/settings/env.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-export const absHosted = !!process.env.PUBLIC_URL;
+export const absHosted = process.env.COMPOSER_AUTH_PROVIDER === 'abs-h';
 export const absHostRoot = process.env.WEBSITE_HOSTNAME
   ? `https://${process.env.WEBSITE_HOSTNAME}`
   : 'http://localhost:3978';