diff --git a/firmware/esp32/xterra-controller/bms.cpp b/firmware/esp32/xterra-controller/bms.cpp
index d2dddac..46e08d1 100644
--- a/firmware/esp32/xterra-controller/bms.cpp
+++ b/firmware/esp32/xterra-controller/bms.cpp
@@ -85,6 +85,9 @@ int scanBleDevices(uint32_t scanSeconds) {
         Serial.println("BLE: Disconnecting BMS before scan");
         client->disconnect();
         bmsData.connected = false;
+
+        Serial.println("BLE: Waiting for device advertising...");
+        delay(2000);
     }
 
     bleScanResultCount = 0;
diff --git a/firmware/esp32/xterra-controller/xterra-controller.ino b/firmware/esp32/xterra-controller/xterra-controller.ino
index 98f70af..e2aa43d 100644
--- a/firmware/esp32/xterra-controller/xterra-controller.ino
+++ b/firmware/esp32/xterra-controller/xterra-controller.ino
@@ -356,7 +356,7 @@ void handleDebugSerial() {
     }
 
     if (command == "scan ble") {
-        int count = scanBleDevices(10);
+        int count = scanBleDevices(20);
 
         if (count == 0) {
             Serial.println("No BLE devices found.");