diff --git a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
index 5523eeacc..c2327065f 100644
--- a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
+++ b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
@@ -46,7 +46,7 @@ function AssistActions({ toggleChatWindow, userId, calling }: Props) {
       }).catch(onError);
   }
 
-  const inCall = calling == CallingState.Requesting || CallingState.True
+  const inCall = calling == 0 || calling == 1
 
   return (
     <div className="flex items-center">
@@ -54,13 +54,13 @@ function AssistActions({ toggleChatWindow, userId, calling }: Props) {
         trigger={
           <div
             className={cn('cursor-pointer p-2 mr-2')}
-            onClick={call}
+            onClick={inCall ? endCall : call}
             role="button"
           >
             <Icon
               name="telephone-fill"
               size="20"
-              color={ calling == CallingState.Requesting ? "red" : "teal" }
+              color={ calling !== 2 ? "red" : "teal" }
             />
           </div>
         }
@@ -70,7 +70,7 @@ function AssistActions({ toggleChatWindow, userId, calling }: Props) {
         position="top right"
       />
       <div className="fixed ml-3 left-0 top-0 z-50">
-        { showChat && <ChatWindow incomeStream={incomeStream} localStream={localStream} /> }
+        { inCall && <ChatWindow incomeStream={incomeStream} localStream={localStream} /> }
       </div>
     </div>
   )
diff --git a/frontend/env.js b/frontend/env.js
index aeb8d1d5f..7e07175b4 100644
--- a/frontend/env.js
+++ b/frontend/env.js
@@ -5,13 +5,13 @@ require('dotenv').config()
 
 const oss = {
 	name: 'oss',
-	PRODUCTION: true,
+	PRODUCTION: false,
 	SENTRY_ENABLED: false,
 	SENTRY_URL: "",
 	CAPTCHA_ENABLED: process.env.CAPTCHA_ENABLED === 'true',
 	CAPTCHA_SITE_KEY: process.env.CAPTCHA_SITE_KEY,
 	ORIGIN: () => 'window.location.origin',
-	API_EDP: () => 'window.location.origin + "/api"',
+	API_EDP: 'https://do.openreplay.com/api',
 	ASSETS_HOST: () => 'window.location.origin + "/assets"',
 	VERSION: '1.0.0',
 	SOURCEMAP: true,