diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp
index 9e27fff13..4bb50f279 100644
--- a/radio/src/bluetooth.cpp
+++ b/radio/src/bluetooth.cpp
@@ -289,7 +289,6 @@ void Bluetooth::wakeup(void)
   else {
     static tmr10ms_t waitEnd = 0;
     if (state != BLUETOOTH_STATE_IDLE) {
-
       if (state == BLUETOOTH_INIT) {
         bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE);
         char command[32];
@@ -310,19 +309,19 @@ void Bluetooth::wakeup(void)
       }
       else if (state == BLUETOOTH_WAIT_TTM) {
         if (get_tmr10ms() > waitEnd) {
-            char * line = readline();
-            if (strncmp(line, "OK+", 3)) {
+          char * line = readline();
+          if (strncmp(line, "OK+", 3)) {
             state = BLUETOOTH_STATE_IDLE;
-            }
-            else {
-              bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE);
-              const char btMessage[] = "TTM:BPS-115200";
-              writeString(btMessage);
-              state = BLUETOOTH_WAIT_BAUDRATE_CHANGE;
-              waitEnd = get_tmr10ms() + 250; // 2.5s
-            }
+          }
+          else {
+            bluetoothInit(BLUETOOTH_FACTORY_BAUDRATE);
+            const char btMessage[] = "TTM:BPS-115200";
+            writeString(btMessage);
+            state = BLUETOOTH_WAIT_BAUDRATE_CHANGE;
+            waitEnd = get_tmr10ms() + 250; // 2.5s
           }
         }
+      }
       else if (state == BLUETOOTH_WAIT_BAUDRATE_CHANGE) {
         if (get_tmr10ms() > waitEnd) {
           state = BLUETOOTH_INIT;
@@ -470,11 +469,14 @@ void Bluetooth::flashFirmware(const char * filename)
 
   pausePulses();
 
+  /* go to bootloader mode */
+  bluetoothDone();
+
   drawProgressScreen(getBasename(filename), "Device reset...", 0, 0);
 
-  /* wait 2s off */
-  watchdogSuspend(2000);
-  RTOS_WAIT_MS(2000);
+  /* wait 100ms */
+  watchdogSuspend(100);
+  RTOS_WAIT_MS(100);
 
   const char * result = nullptr;
 
diff --git a/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp b/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp
index 66a883bdd..1377b3192 100644
--- a/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/bluetooth_driver.cpp
@@ -93,7 +93,7 @@ void bluetoothInit(uint32_t baudrate)
 
 void bluetoothDone()
 {
-  GPIO_SetBits(BT_EN_GPIO, BT_EN_GPIO_PIN); // close bluetooth
+  GPIO_SetBits(BT_EN_GPIO, BT_EN_GPIO_PIN); // close bluetooth (recent modules will go to bootloader mode)
 }
 
 extern "C" void BT_USART_IRQHandler(void)