diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81418ba59..294b582f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fixed `hf 15 writedsfid` - long wait after write and dont force -o flag (@iceman1001)
  - Changed `hf 14a sniff -i` - now supports the interactive flag (@iceman1001)
  - Added `HF_15SIM` standalone mode that dump then simulate iso15 tags (@lnv42)
  - Changed `iso15 simulation`, reworked, added support for lot of features (@lnv42)
diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c
index 3cdd256ef..34d4399d1 100644
--- a/client/src/cmdhf15.c
+++ b/client/src/cmdhf15.c
@@ -1660,14 +1660,6 @@ static int CmdHF15WriteDsfid(const char *Cmd) {
         return PM3_EINVARG;
     }
 
-    // enforcing add_option since we are writing.
-    if (add_option == false) {
-        if (verbose) {
-            PrintAndLogEx(INFO, "Overriding OPTION param since we are writing (ENFORCE)");
-        }
-        add_option = true;
-    }
-
     // request to be sent to device/card
     uint8_t approxlen = 2 + 8 + 1 + 2;
     iso15_raw_cmd_t *packet = (iso15_raw_cmd_t *)calloc(1, sizeof(iso15_raw_cmd_t) + approxlen);
@@ -1705,7 +1697,7 @@ static int CmdHF15WriteDsfid(const char *Cmd) {
     AddCrc15(packet->raw,  packet->rawlen);
     packet->rawlen += 2;
 
-    packet->flags = (ISO15_CONNECT | ISO15_READ_RESPONSE);
+    packet->flags = (ISO15_CONNECT | ISO15_READ_RESPONSE | ISO15_LONG_WAIT);
     if (fast) {
         packet->flags |= ISO15_HIGH_SPEED;
     }