diff --git a/keystore/confirmation_manager.cpp b/keystore/confirmation_manager.cpp
index c6ae1a0..76df1cc 100644
--- a/keystore/confirmation_manager.cpp
+++ b/keystore/confirmation_manager.cpp
@@ -125,15 +125,7 @@
 void ConfirmationManager::cancelPrompt() {
     mMutex.lock();
     mRateLimiting.cancelPrompt();
-    if (mCurrentListener != nullptr) {
-        mCurrentListener->unlinkToDeath(mDeathRecipient);
-        mCurrentListener = nullptr;
-    }
     sp<IConfirmationUI> confirmationUI = mCurrentConfirmationUI;
-    if (mCurrentConfirmationUI != nullptr) {
-        mCurrentConfirmationUI->unlinkToDeath(this);
-        mCurrentConfirmationUI = nullptr;
-    }
     mMutex.unlock();
     if (confirmationUI != nullptr) {
         confirmationUI->abort();