diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraView.java b/src/org/thoughtcrime/securesms/components/camera/CameraView.java
index c2b114523f..a60f4b75f7 100644
--- a/src/org/thoughtcrime/securesms/components/camera/CameraView.java
+++ b/src/org/thoughtcrime/securesms/components/camera/CameraView.java
@@ -224,6 +224,11 @@ public class CameraView extends FrameLayout {
         previewHeight = height;
       }
 
+      if (previewHeight == 0 || previewWidth == 0) {
+        Log.w(TAG, "skipping layout due to zero-width/height preview size");
+        return;
+      }
+
       boolean useFirstStrategy = (width * previewHeight > height * previewWidth);
       boolean useFullBleed     = getHost().useFullBleedPreview();