diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 3fc9efc..2d9de5d 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -309,8 +309,10 @@
         return rc;
     }
 
+    auto& dev = getDevice(keyBlob);
+
     if (keyBlob.getType() == ::TYPE_KEY_PAIR || keyBlob.getType() == ::TYPE_KEYMASTER_10) {
-        auto ret = KS_HANDLE_HIDL_ERROR(mDevice->deleteKey(blob2hidlVec(keyBlob)));
+        auto ret = KS_HANDLE_HIDL_ERROR(dev->deleteKey(blob2hidlVec(keyBlob)));
 
         // A device doesn't have to implement delete_key.
         if (ret != ErrorCode::OK && ret != ErrorCode::UNIMPLEMENTED)