diff --git a/src/components/Room/RoomAudioControls.tsx b/src/components/Room/RoomAudioControls.tsx
index 0bac291..4573fc8 100644
--- a/src/components/Room/RoomAudioControls.tsx
+++ b/src/components/Room/RoomAudioControls.tsx
@@ -78,7 +78,7 @@ export function RoomAudioControls({ peerRoom }: RoomAudioControlsProps) {
           {isSpeakingToRoom ? <RecordVoiceOver /> : <VoiceOverOff />}
         </MediaButton>
       </Tooltip>
-      {audioDevices.length > 0 && (
+      {audioDevices.length > 0 && isSpeakingToRoom && (
         <Box sx={{ mt: 1 }}>
           <List
             component="nav"
diff --git a/src/components/Room/RoomVideoControls.tsx b/src/components/Room/RoomVideoControls.tsx
index 114614a..5cfacb0 100644
--- a/src/components/Room/RoomVideoControls.tsx
+++ b/src/components/Room/RoomVideoControls.tsx
@@ -72,7 +72,7 @@ export function RoomVideoControls({ peerRoom }: RoomVideoControlsProps) {
           {isCameraEnabled ? <Videocam /> : <VideocamOff />}
         </MediaButton>
       </Tooltip>
-      {videoDevices.length > 0 && (
+      {videoDevices.length > 0 && isCameraEnabled && (
         <Box sx={{ mt: 1 }}>
           <List
             component="nav"