diff --git a/applications/main/nfc/nfc.c b/applications/main/nfc/nfc.c
index 115821afd..90fcf9f27 100644
--- a/applications/main/nfc/nfc.c
+++ b/applications/main/nfc/nfc.c
@@ -47,7 +47,7 @@ Nfc* nfc_alloc() {
     // Nfc device
     nfc->dev = nfc_device_alloc();
     furi_string_set(nfc->dev->folder, NFC_APP_FOLDER);
-    
+
     // Open GUI record
     nfc->gui = furi_record_open(RECORD_GUI);
 
diff --git a/applications/plugins/nfc_magic/nfc_magic.c b/applications/plugins/nfc_magic/nfc_magic.c
index 18ffa9a54..e4e0ffde0 100644
--- a/applications/plugins/nfc_magic/nfc_magic.c
+++ b/applications/plugins/nfc_magic/nfc_magic.c
@@ -50,7 +50,7 @@ NfcMagic* nfc_magic_alloc() {
     // Nfc device
     nfc_magic->nfc_dev = nfc_device_alloc();
     furi_string_set(nfc_magic->nfc_dev->folder, NFC_APP_FOLDER);
-    
+
     // Open GUI record
     nfc_magic->gui = furi_record_open(RECORD_GUI);
     view_dispatcher_attach_to_gui(
diff --git a/lib/nfc/nfc_device.c b/lib/nfc/nfc_device.c
index 2fa9d0b7c..e5f7bf9ff 100644
--- a/lib/nfc/nfc_device.c
+++ b/lib/nfc/nfc_device.c
@@ -1362,7 +1362,7 @@ bool nfc_device_save(NfcDevice* dev, const char* dev_name) {
             break;
         }
         furi_string_free(folder);
-
+        // First remove nfc device file if it was saved
         // Open file
         if(!flipper_format_file_open_always(file, furi_string_get_cstr(temp_str))) break;
         // Write header
@@ -1611,7 +1611,11 @@ bool nfc_device_delete(NfcDevice* dev, bool use_load_path) {
             furi_string_set(file_path, dev->load_path);
         } else {
             furi_string_printf(
-                file_path, "%s/%s%s", NFC_APP_FOLDER, dev->dev_name, NFC_APP_EXTENSION);
+                file_path,
+                "%s/%s%s",
+                furi_string_get_cstr(dev->folder),
+                dev->dev_name,
+                NFC_APP_EXTENSION);
         }
         if(!storage_simply_remove(dev->storage, furi_string_get_cstr(file_path))) break;
         // Delete shadow file if it exists