diff --git a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
index 2d7a7baf1..58eadd472 100644
--- a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
+++ b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx
@@ -91,12 +91,6 @@ function AssistActions({ toggleChatWindow, userId, calling, peerConnectionStatus
         onClick={ requestReleaseRemoteControl }
         role="button"
       >
-        {/* <Icon
-          name="remote-control"
-          size="20"
-          color={ remoteControlStatus === RemoteControlStatus.Enabled ? "green" : "gray-darkest"}
-        />
-        <span className={cn("ml-2", { 'color-green' : remoteControlStatus === RemoteControlStatus.Enabled })}>{ 'Remote Control' }</span> */}
         <IconButton label={`${remoteActive ? 'Stop ' : ''} Remote Control`} icon="remote-control" primaryText redText={remoteActive} />
       </div>
       
@@ -112,12 +106,6 @@ function AssistActions({ toggleChatWindow, userId, calling, peerConnectionStatus
             onClick={ onCall ? callObject?.end : confirmCall}
             role="button"
           >
-            {/* <Icon
-              name="headset"
-              size="20"
-              color={ onCall ? "red" : "gray-darkest" }
-            />
-            <span className={cn("ml-2", { 'color-red' : onCall })}>{ onCall ? 'End Call' : 'Call' }</span> */}
             <IconButton size="small" primary={!onCall} red={onCall} label={onCall ? 'End' : 'Call'} icon="headset" />
           </div>
         }
diff --git a/frontend/app/player/MessageDistributor/managers/AssistManager.ts b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
index 51895b327..908add195 100644
--- a/frontend/app/player/MessageDistributor/managers/AssistManager.ts
+++ b/frontend/app/player/MessageDistributor/managers/AssistManager.ts
@@ -171,7 +171,8 @@ export default class AssistManager {
           this.setStatus(ConnectionStatus.Disconnected)
         }, 12000)
 
-        if (getState().remoteControl === RemoteControlStatus.Requesting) {
+        if (getState().remoteControl === RemoteControlStatus.Requesting ||
+        getState().remoteControl === RemoteControlStatus.Enabled) {
           this.toggleRemoteControl(false)
         }