diff --git a/scripts/yau07.gd b/scripts/yau07.gd
index d479647e..ad2a1b5d 100644
--- a/scripts/yau07.gd
+++ b/scripts/yau07.gd
@@ -306,9 +306,8 @@ class YaU07 extends unit.Unit:
 
         var cmd_code: int = rx_data[cmd_code_pos]            # Код команды
 
+        cmd_code_rx = cmd_code
         if (cmd_state == CmdState.WAIT) and (cmd_num_rx == cmd_num_tx) and (cmd_code == cmd_code_tx):
-            cmd_code_rx = cmd_code
-            cmd_state = CmdState.DONE
             var rc: = true
             if (cmd_code == CmdCode.READ_ISA) or (cmd_code == CmdCode.WRITE_ISA):
                 rc = parse_isa(rx_data, status_len)
@@ -320,6 +319,7 @@ class YaU07 extends unit.Unit:
                 rc = parse_flash(rx_data, status_len, cmd_code)
 
             if rc:
+                cmd_state = CmdState.DONE
                 emit_signal('command_done', self)
             else:
                 emit_signal('parse_failed', self)