diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/call/CallWidgets.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/call/CallWidgets.kt
index e6248d2c96..c606bd60f6 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/call/CallWidgets.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/call/CallWidgets.kt
@@ -63,6 +63,7 @@ fun VideoRenderer(
     eglBase: org.webrtc.EglBase?,
     modifier: Modifier = Modifier,
     mirror: Boolean = false,
+    zOrderMediaOverlay: Boolean = false,
 ) {
     // Track the current track so the update block can swap sinks when the
     // track reference changes (e.g. after renegotiation).
@@ -74,11 +75,13 @@ fun VideoRenderer(
             SurfaceViewRenderer(ctx).apply {
                 setMirror(mirror)
                 setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL)
+                setZOrderMediaOverlay(zOrderMediaOverlay)
                 eglBase?.eglBaseContext?.let { init(it, null) }
                 videoTrack.addSink(this)
             }
         },
         update = { renderer ->
+            renderer.setMirror(mirror)
             if (currentTrack.value !== videoTrack) {
                 try {
                     currentTrack.value.removeSink(renderer)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/call/ConnectedCallUI.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/call/ConnectedCallUI.kt
index 5bcb659430..3e7dedcc60 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/call/ConnectedCallUI.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/call/ConnectedCallUI.kt
@@ -164,6 +164,7 @@ fun ConnectedCallUI(
                                 .windowInsetsPadding(WindowInsets.statusBars)
                                 .padding(16.dp),
                         mirror = isFrontCamera,
+                        zOrderMediaOverlay = true,
                     )
                 }
             }