diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index b50ab18..322ab0d 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1583,6 +1583,8 @@
         }
         // Dismiss open menu if exists.
         PopupManager.getInstance(this).notifyShowPopup(null);
+
+        if (mCameraSound == null) mCameraSound = new MediaActionSound();
     }
 
     @Override
@@ -1591,7 +1593,10 @@
         stopPreview();
         // Close the camera now because other activities may need to use it.
         closeCamera();
-        if (mCameraSound != null) mCameraSound.release();
+        if (mCameraSound != null) {
+            mCameraSound.release();
+            mCameraSound = null;
+        }
         resetScreenOn();
 
         // Clear UI.