diff --git a/app/src/main/java/org/thoughtcrime/securesms/ringrtc/Camera.java b/app/src/main/java/org/thoughtcrime/securesms/ringrtc/Camera.java
index 8cd080aa52..3c5be71189 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ringrtc/Camera.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ringrtc/Camera.java
@@ -108,10 +108,10 @@ public class Camera implements CameraControl, CameraVideoCapturer.CameraSwitchHa
 
   @Override
   public void setOrientation(@Nullable Integer orientation) {
-    this.orientation = orientation;
+    this.orientation = orientation != null ? orientation : 0;
 
     if (isInitialized && capturer != null) {
-      capturer.setOrientation(orientation);
+      capturer.setOrientation(this.orientation);
     }
   }