diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
index c017ae2449..f4c7741a15 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
@@ -556,6 +556,8 @@ class ConversationFragment :
     ToolbarDependentMarginListener(binding.toolbar)
     initializeMediaKeyboard()
 
+    binding.conversationVideoContainer.setClipToOutline(true)
+
     registerForResults()
   }
 
diff --git a/app/src/main/res/layout/v2_conversation_fragment.xml b/app/src/main/res/layout/v2_conversation_fragment.xml
index d58d434211..9aad6f05c0 100644
--- a/app/src/main/res/layout/v2_conversation_fragment.xml
+++ b/app/src/main/res/layout/v2_conversation_fragment.xml
@@ -31,10 +31,10 @@
         android:id="@+id/conversation_video_container"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="@id/conversation_item_recycler"
-        app:layout_constraintEnd_toEndOf="@+id/conversation_item_recycler"
-        app:layout_constraintStart_toStartOf="@+id/conversation_item_recycler"
-        app:layout_constraintTop_toTopOf="@+id/conversation_item_recycler" />
+        app:layout_constraintBottom_toBottomOf="@id/conversation_item_recycler_frame"
+        app:layout_constraintEnd_toEndOf="@+id/conversation_item_recycler_frame"
+        app:layout_constraintStart_toStartOf="@+id/conversation_item_recycler_frame"
+        app:layout_constraintTop_toTopOf="@+id/conversation_item_recycler_frame" />
 
     <FrameLayout
         android:id="@+id/conversation_item_recycler_frame"