diff --git a/src/com/android/camera/app/CameraController.java b/src/com/android/camera/app/CameraController.java
index c87df91..019bb94 100644
--- a/src/com/android/camera/app/CameraController.java
+++ b/src/com/android/camera/app/CameraController.java
@@ -161,7 +161,13 @@
     public void onCameraOpened(CameraAgent.CameraProxy camera) {
         Log.v(TAG, "onCameraOpened");
         if (mRequestingCameraId != camera.getCameraId()) {
-            // Not requesting any camera or not waiting for this one.
+            // Not requesting any camera or not waiting for this one, so close
+            // it.
+            if (mUsingNewApi) {
+                mCameraAgentNg.closeCamera(camera, false);
+            } else {
+                mCameraAgent.closeCamera(camera, false);
+            }
             return;
         }
         mCameraProxy = camera;