diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index 8620e71..f19c502 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.cpp
@@ -117,6 +117,7 @@
     LOGV("disconnect");
     if (mCamera != 0) {
         mCamera->disconnect();
+        mCamera->asBinder()->unlinkToDeath(this);
         mCamera = 0;
     }
 }