diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
index 2a1c925913..0037397bda 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -25,10 +25,12 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.camera.core.AspectRatio;
 import androidx.camera.core.CameraSelector;
 import androidx.camera.core.ImageCapture;
 import androidx.camera.core.ImageCaptureException;
 import androidx.camera.core.ImageProxy;
+import androidx.camera.core.Preview;
 import androidx.camera.view.CameraController;
 import androidx.camera.view.LifecycleCameraController;
 import androidx.camera.view.PreviewView;
@@ -75,7 +77,8 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
   private static final String IS_VIDEO_ENABLED = "is_video_enabled";
 
 
-  private static final Rational ASPECT_RATIO_16_9 = new Rational(16, 9);
+  private static final Rational              ASPECT_RATIO_16_9  = new Rational(16, 9);
+  private static final PreviewView.ScaleType PREVIEW_SCALE_TYPE = PreviewView.ScaleType.FILL_CENTER;
 
   private PreviewView               previewView;
   private ViewGroup                 controlsContainer;
@@ -141,7 +144,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
     cameraController.setImageCaptureMode(CameraXUtil.getOptimalCaptureMode());
     cameraController.setEnabledUseCases(getSupportedUseCases());
 
-    previewView.setScaleType(PreviewView.ScaleType.FIT_CENTER);
+    previewView.setScaleType(PREVIEW_SCALE_TYPE);
     previewView.setController(cameraController);
 
     onOrientationChanged(getResources().getConfiguration().orientation);
@@ -160,6 +163,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
         params.height = (int) height;
 
         cameraParent.setLayoutParams(params);
+        cameraController.setPreviewTargetSize(new CameraController.OutputSize(new Size((int) width, (int) height)));
       }
     });
   }
@@ -312,7 +316,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment {
       onCaptureClicked();
     });
 
-    previewView.setScaleType(PreviewView.ScaleType.FILL_CENTER);
+    previewView.setScaleType(PREVIEW_SCALE_TYPE);
 
     cameraController.getInitializationFuture()
                     .addListener(() -> initializeFlipButton(flipButton, flashButton), Executors.mainThreadExecutor());
diff --git a/app/src/main/res/layout/camerax_fragment.xml b/app/src/main/res/layout/camerax_fragment.xml
index f984fc9d8b..8d5ca0a943 100644
--- a/app/src/main/res/layout/camerax_fragment.xml
+++ b/app/src/main/res/layout/camerax_fragment.xml
@@ -9,7 +9,7 @@
     <androidx.cardview.widget.CardView
         android:id="@+id/camerax_camera_parent"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         app:cardCornerRadius="18dp"
         app:cardElevation="0dp"
         app:layout_constraintTop_toTopOf="parent">