diff --git a/bootloaders/eboot/eboot.c b/bootloaders/eboot/eboot.c
index 69bc692e97..a640f9130e 100644
--- a/bootloaders/eboot/eboot.c
+++ b/bootloaders/eboot/eboot.c
@@ -128,13 +128,14 @@ int copy_raw(const uint32_t src_addr,
 void main()
 {
     int res = 9;
+    bool clear_cmd = false;
     struct eboot_command cmd;
     
     print_version(0);
 
     if (eboot_command_read(&cmd) == 0) {
         // valid command was passed via RTC_MEM
-        eboot_command_clear();
+        clear_cmd = true;
         ets_putc('@');
     } else {
         // no valid command found
@@ -155,6 +156,10 @@ void main()
         }
     }
 
+    if (clear_cmd) {
+        eboot_command_clear();
+    }
+
     if (cmd.action == ACTION_LOAD_APP) {
         ets_putc('l'); ets_putc('d'); ets_putc('\n');
         res = load_app_from_flash_raw(cmd.args[0]);