diff --git a/esphome/nspanel_esphome_addon_upload_tft.yaml b/esphome/nspanel_esphome_addon_upload_tft.yaml
index eab5472..cd9e39c 100644
--- a/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -260,10 +260,30 @@ script:
           #endif  // USE_BLUETOOTH_PROXY
           ESP_LOGD(TAG, "  Stopping BLE Tracker scan...");
           ble_tracker->stop_scan();
+          #ifdef ARDUINO
+          delay(1000);
+          #elif defined(USE_ESP_IDF)
+          vTaskDelay(pdMS_TO_TICKS(1000));
+          #endif
+          App.feed_wdt();
           ESP_LOGD(TAG, "  Disabling BLE Tracker scan...");
           ble_tracker->set_scan_active(false);
-          ESP_LOGD(TAG, "  Disabling BLE...");
-          ble_tracker->get_parent()->disable();
+          #ifdef ARDUINO
+          delay(1000);
+          #elif defined(USE_ESP_IDF)
+          vTaskDelay(pdMS_TO_TICKS(1000));
+          #endif
+          App.feed_wdt();
+          if (ble_tracker->get_parent() != nullptr) {
+            ESP_LOGD(TAG, "  Disabling BLE...");
+            ble_tracker->get_parent()->disable();
+          }
+          #ifdef ARDUINO
+          delay(1000);
+          #elif defined(USE_ESP_IDF)
+          vTaskDelay(pdMS_TO_TICKS(1000));
+          #endif
+          App.feed_wdt();
           ble_tracker->dump_config();
           #endif  // USE_ESP32_BLE_CLIENT