diff --git a/frontend/app/components/Assist/ChatWindow/ChatWindow.tsx b/frontend/app/components/Assist/ChatWindow/ChatWindow.tsx
index c070c3b50..ec61f6bd6 100644
--- a/frontend/app/components/Assist/ChatWindow/ChatWindow.tsx
+++ b/frontend/app/components/Assist/ChatWindow/ChatWindow.tsx
@@ -17,7 +17,9 @@ export interface Props {
 
 function ChatWindow({ userId, incomeStream, localStream, endCall, isPrestart }: Props) {
   const [localVideoEnabled, setLocalVideoEnabled] = useState(false)
+  const [anyRemoteEnabled, setRemoteEnabled] = useState(false)
 
+  const onlyLocalEnabled = localVideoEnabled && !anyRemoteEnabled
   return (
     <Draggable handle=".handle" bounds="body">
       <div
@@ -32,13 +34,13 @@ function ChatWindow({ userId, incomeStream, localStream, endCall, isPrestart }:
           </div>
           <Counter startTime={new Date().getTime() } className="text-sm ml-auto" />
         </div>
-        <div className={cn(stl.videoWrapper, 'relative')} style={{ minHeight: localVideoEnabled ? 52 : undefined}}>
+        <div className={cn(stl.videoWrapper, 'relative')} style={{ minHeight: onlyLocalEnabled ? 52 : undefined}}>
           {incomeStream
-            ? incomeStream.map(stream => <React.Fragment key={stream.id}><VideoContainer stream={ stream } /></React.Fragment>) : (
+            ? incomeStream.map(stream => <React.Fragment key={stream.id}><VideoContainer stream={ stream } setRemoteEnabled={setRemoteEnabled} /></React.Fragment>) : (
             <div className={stl.noVideo}>Error obtaining incoming streams</div>
           )}
           <div className={cn("absolute bottom-0 right-0 z-50", localVideoEnabled ? "" : "!hidden")}>
-            <VideoContainer stream={ localStream ? localStream.stream : null } muted height={50} />
+            <VideoContainer stream={ localStream ? localStream.stream : null } muted height={anyRemoteEnabled ? 50 : 280} />
           </div>
         </div>
         <ChatControls videoEnabled={localVideoEnabled} setVideoEnabled={setLocalVideoEnabled} stream={localStream} endCall={endCall} isPrestart={isPrestart} />
diff --git a/frontend/app/components/Assist/components/VideoContainer/VideoContainer.tsx b/frontend/app/components/Assist/components/VideoContainer/VideoContainer.tsx
index bff02fb0c..7b64821b0 100644
--- a/frontend/app/components/Assist/components/VideoContainer/VideoContainer.tsx
+++ b/frontend/app/components/Assist/components/VideoContainer/VideoContainer.tsx
@@ -3,10 +3,11 @@ import React, { useEffect, useRef } from 'react'
 interface Props {
   stream: MediaStream | null
   muted?: boolean,
-  height?: number
+  height?: number,
+  setRemoteEnabled?: (isEnabled: boolean) => void
 }
 
-function VideoContainer({ stream, muted = false, height = 280 }: Props) {
+function VideoContainer({ stream, muted = false, height = 280, setRemoteEnabled }: Props) {
   const ref = useRef<HTMLVideoElement>(null);
   const [isEnabled, setEnabled] = React.useState(false);
 
@@ -22,7 +23,10 @@ function VideoContainer({ stream, muted = false, height = 280 }: Props) {
       const settings = stream.getVideoTracks()[0]?.getSettings()
       const isDummyVideoTrack = settings ? (settings.width === 2 || settings.frameRate === 0 || !settings.frameRate && !settings.width) : true
       const shouldBeEnabled = !isDummyVideoTrack
-      isEnabled !== shouldBeEnabled ? setEnabled(shouldBeEnabled) : null;
+      if (isEnabled !== shouldBeEnabled) {
+        setEnabled(shouldBeEnabled)
+        setRemoteEnabled?.(shouldBeEnabled)
+      }
     }, 500)
     return () => clearInterval(iid)
   }, [ stream, isEnabled ])