diff --git a/client/emv/cmdemv.c b/client/emv/cmdemv.c
index 041ad73ee..c3d569b42 100644
--- a/client/emv/cmdemv.c
+++ b/client/emv/cmdemv.c
@@ -287,7 +287,8 @@ static int CmdEMVGPO(const char *Cmd) {
         PrintAndLogEx(ERR, "Can't create PDOL data.");
         tlvdb_free(tmp_ext);
         tlvdb_free(tlvRoot);
-        free(data_tlv);
+        if ( pdol_data_tlv != &data_tlv);
+            free(pdol_data_tlv);
         return 4;
     }
     PrintAndLogEx(INFO, "PDOL data[%d]: %s", pdol_data_tlv_data_len, sprint_hex(pdol_data_tlv_data, pdol_data_tlv_data_len));