diff --git a/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic_render.c b/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic_render.c
index 5bd4a6b6d..0382b3333 100644
--- a/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic_render.c
+++ b/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic_render.c
@@ -18,13 +18,48 @@ void nfc_render_mf_classic_info(
     furi_string_cat_printf(str, "\nSectors Read: %u/%u", sectors_read, sectors_total);
 }
 
+static void
+    mf_classic_render_raw_data(const uint8_t* data, size_t size, bool data_read, FuriString* str) {
+    furi_assert((size % 2) == 0);
+
+    for(size_t i = 0; i < size; i += 2) {
+        if(data_read) {
+            furi_string_cat_printf(str, "%02X%02X ", data[i], data[i + 1]);
+        } else {
+            furi_string_cat_printf(str, "???? ");
+        }
+    }
+}
+
+static void
+    mf_classic_render_block(const MfClassicData* data, uint8_t block_num, FuriString* str) {
+    if(mf_classic_is_sector_trailer(block_num)) {
+        uint8_t sec_num = mf_classic_get_sector_by_block(block_num);
+        MfClassicSectorTrailer* sec_tr = mf_classic_get_sector_trailer_by_sector(data, sec_num);
+
+        // Render key A
+        bool key_read = mf_classic_is_key_found(data, sec_num, MfClassicKeyTypeA);
+        mf_classic_render_raw_data(sec_tr->key_a.data, sizeof(MfClassicKey), key_read, str);
+
+        // Render access bits
+        bool access_bits_read = mf_classic_is_block_read(data, block_num);
+        mf_classic_render_raw_data(
+            sec_tr->access_bits.data, sizeof(MfClassicAccessBits), access_bits_read, str);
+
+        // Render key B
+        key_read = mf_classic_is_key_found(data, sec_num, MfClassicKeyTypeB);
+        mf_classic_render_raw_data(sec_tr->key_b.data, sizeof(MfClassicKey), key_read, str);
+    } else {
+        const uint8_t* block_data = data->block[block_num].data;
+        bool block_read = mf_classic_is_block_read(data, block_num);
+        mf_classic_render_raw_data(block_data, sizeof(MfClassicBlock), block_read, str);
+    }
+}
+
 void nfc_render_mf_classic_dump(const MfClassicData* data, FuriString* str) {
     uint16_t total_blocks = mf_classic_get_total_block_num(data->type);
 
     for(size_t i = 0; i < total_blocks; i++) {
-        for(size_t j = 0; j < sizeof(MfClassicBlock); j += 2) {
-            furi_string_cat_printf(
-                str, "%02X%02X ", data->block[i].data[j], data->block[i].data[j + 1]);
-        }
+        mf_classic_render_block(data, i, str);
     }
 }