diff --git a/src/components/Room/PeerVideo.tsx b/src/components/Room/PeerVideo.tsx
index 804d748..5287d87 100644
--- a/src/components/Room/PeerVideo.tsx
+++ b/src/components/Room/PeerVideo.tsx
@@ -8,6 +8,7 @@ import { VideoStreamType } from 'models/chat'
 import { SelectedPeerStream } from './RoomVideoDisplay'
 
 interface PeerVideoProps {
+  isSelfScreenStream?: boolean
   isSelfVideo?: boolean
   numberOfVideos: number
   onVideoClick?: (
@@ -29,6 +30,7 @@ const nextPerfectSquare = (base: number) => {
 }
 
 export const PeerVideo = ({
+  isSelfScreenStream,
   isSelfVideo,
   numberOfVideos,
   onVideoClick,
@@ -87,6 +89,7 @@ export const PeerVideo = ({
       >
         <video
           playsInline
+          muted={isSelfScreenStream}
           ref={videoRef}
           onClick={handleVideoClick}
           style={{
diff --git a/src/components/Room/RoomVideoDisplay.tsx b/src/components/Room/RoomVideoDisplay.tsx
index 060660e..b2fefac 100644
--- a/src/components/Room/RoomVideoDisplay.tsx
+++ b/src/components/Room/RoomVideoDisplay.tsx
@@ -173,6 +173,7 @@ export const RoomVideoDisplay = ({
         )}
         {selfScreenStream && (
           <PeerVideo
+            isSelfScreenStream
             numberOfVideos={numberOfVideos}
             onVideoClick={handleVideoClick}
             userId={userId}
diff --git a/src/components/Room/useRoomVideo.ts b/src/components/Room/useRoomVideo.ts
index 145e103..85c6838 100644
--- a/src/components/Room/useRoomVideo.ts
+++ b/src/components/Room/useRoomVideo.ts
@@ -66,8 +66,6 @@ export function useRoomVideo({ peerRoom }: UseRoomVideoConfig) {
           type: VideoStreamType.WEBCAM,
         })
         setSelfVideoStream(newSelfStream)
-
-        setSelfVideoStream(newSelfStream)
       }
     })()
   }, [peerRoom, selfVideoStream, setSelfVideoStream])
@@ -144,7 +142,6 @@ export function useRoomVideo({ peerRoom }: UseRoomVideoConfig) {
           sendVideoChange(VideoState.STOPPED)
           setVideoState(VideoState.STOPPED)
           setSelfVideoStream(null)
-          setSelfVideoStream(null)
         }
       }
     })()