diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 0f5906ac..b6a7e310 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -1208,12 +1208,13 @@ int CmdHFEMVScan(const char *cmd) {
 		// check search and select application id
 		TLVPrintAIDlistFromSelectTLV(tlvSelect);
 	}
-	tlvdb_free(tlvSelect);
 
 	// EMV SELECT application
 	SetAPDULogging(showAPDU);
 	EMVSelectApplication(tlvSelect, AID, &AIDlen);
 
+	tlvdb_free(tlvSelect);
+
 	if (!AIDlen) {
 		PrintAndLog("Can't select AID. EMV AID not found. Exit...");
 		return 4;