diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c
index 702e6ea68..44e325c43 100644
--- a/client/src/cmdhfmfdes.c
+++ b/client/src/cmdhfmfdes.c
@@ -2840,7 +2840,7 @@ static int CmdHF14ADesGetKeyVersions(const char *Cmd) {
         return PM3_EINVARG;
     }
 
-    if (keysetpresent && id == 0x000000) {
+    if (keysetpresent && DesfireMFSelected(selectway, id)) {
         PrintAndLogEx(WARNING, "Keyset only at Application level");
         keysetpresent = false;
     }