diff --git a/packages/camera/camera/CHANGELOG.md b/packages/camera/camera/CHANGELOG.md
index 622bd095b021..e365e76cbafd 100644
--- a/packages/camera/camera/CHANGELOG.md
+++ b/packages/camera/camera/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.7.0+4
+
+* Fix crash when taking picture with orientation lock
+
 ## 0.7.0+3
 
 * Clockwise rotation of focus point in android 
diff --git a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java
index 7c6011b185fb..b2a504b629d6 100644
--- a/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java
+++ b/packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DeviceOrientationManager.java
@@ -55,6 +55,12 @@ public int getMediaOrientation() {
 
   public int getMediaOrientation(PlatformChannel.DeviceOrientation orientation) {
     int angle = 0;
+
+    // Fallback to device orientation when the orientation value is null
+    if (orientation == null) {
+      orientation = getUIOrientation();
+    }
+
     switch (orientation) {
       case PORTRAIT_UP:
         angle = 0;
diff --git a/packages/camera/camera/pubspec.yaml b/packages/camera/camera/pubspec.yaml
index cebbb334c8f2..5ac4b57a15ef 100644
--- a/packages/camera/camera/pubspec.yaml
+++ b/packages/camera/camera/pubspec.yaml
@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.7.0+3
+version: 0.7.0+4
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 
 dependencies: