diff --git a/client/src/cmdhfcalypso.c b/client/src/cmdhfcalypso.c
index 8c5e0f1f9..8dc37ceea 100644
--- a/client/src/cmdhfcalypso.c
+++ b/client/src/cmdhfcalypso.c
@@ -1781,6 +1781,10 @@ static void calypso_print_info_data_objects(void) {
             continue;
         }
 
+        if (sw == ISO7816_INS_NOT_SUPPORTED) {
+            break;
+        }
+
         if (has_data == false) {
             continue;
         }
@@ -1811,6 +1815,13 @@ static size_t calypso_probe_get_data_objects(json_t *entries, bool print_results
             continue;
         }
 
+        if (sw == ISO7816_INS_NOT_SUPPORTED) {
+            if (verbose) {
+                PrintAndLogEx(INFO, " %04X %-24s : " _YELLOW_("%04X") " - %s", probe->tag, probe->name, sw, GetAPDUCodeDescription(sw >> 8, sw & 0xFF));
+            }
+            break;
+        }
+
         if (calypso_read_sw_has_data(sw, response_len)) {
             if (print_results || verbose) {
                 calypso_print_get_data_object(probe, response, response_len);