diff --git a/docs/software/TODO.md b/docs/software/TODO.md
index 7ff5c5b78..2c29b000a 100644
--- a/docs/software/TODO.md
+++ b/docs/software/TODO.md
@@ -2,7 +2,7 @@
 
 You probably don't care about this section - skip to the next one.
 
-- check BLE handle stability across sleep - stress test sleep/wake
+- check BLE handle stability across sleep - stress test sleep/wake - btu_init_core calls gatt_init - which assigns handles global
 - test BLE software update again
 - @feh123 Sony Xperia Z1 C6903 running Android 5.1.1
 - first message sent is still doubled for some people
diff --git a/src/esp32/BluetoothSoftwareUpdate.cpp b/src/esp32/BluetoothSoftwareUpdate.cpp
index f5f98a47f..fd4c06155 100644
--- a/src/esp32/BluetoothSoftwareUpdate.cpp
+++ b/src/esp32/BluetoothSoftwareUpdate.cpp
@@ -76,6 +76,7 @@ class DataCharacteristic : public CallbackCharacteristic
         crc.update(data, len);
         Update.write(data, len);
         updateActualSize += len;
+        powerFSM.trigger(EVENT_RECEIVED_TEXT_MSG); // Not exactly correct, but we want to force the device to not sleep now
     }
 };
 
@@ -123,8 +124,10 @@ class CRC32Characteristic : public CallbackCharacteristic
 
 void bluetoothRebootCheck()
 {
-    if (rebootAtMsec && millis() > rebootAtMsec)
+    if (rebootAtMsec && millis() > rebootAtMsec) {
+        DEBUG_MSG("Rebooting for update\n");
         ESP.restart();
+    }
 }
 
 /*