diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index b0ad0ae209458f0f5e0cd59ad9e1857c9a295a5d..07be47f3a3a37fe2956dbffff1b901db630036e5 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -655,6 +655,14 @@ public class PhotoModule
         setCameraId(mCameraId);
 
         // from onPause
+        try {
+            if (mOpenCameraThread != null) {
+                mOpenCameraThread.join();
+                mOpenCameraThread = null;
+            }
+        } catch (InterruptedException ex) {
+            // ignore
+        }
         closeCamera();
         mUI.collapseCameraControls();
         mUI.clearFaces();