diff --git a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
index 5371ec2..996e718 100644
--- a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -114,8 +114,8 @@ script:
           ESP_LOGD(TAG, "Waiting for empty UART and Nextion queues");
       - wait_until:
           condition:
-            - lambda: !lambda return (disp1->queue_size()<=0);
-            - lambda: !lambda return (tf_uart->available()<=0);
+            - lambda: !lambda return (disp1->queue_size() < 1);
+            - lambda: !lambda return (tf_uart->available() < 1);
           timeout: 10s
       - delay: 2s
       - lambda: |-
diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml
index 20a66b4..65648f9 100644
--- a/advanced/esphome/nspanel_esphome_core.yaml
+++ b/advanced/esphome/nspanel_esphome_core.yaml
@@ -2574,9 +2574,8 @@ script:
             - wait_until:
                 condition:
                   - lambda: !lambda return (tf_uart->available() < 1);
-                timeout: 3s
+                timeout: 5s
             - lambda: |-
-                tf_uart->flush();
                 static const char *const TAG = "script.set_baud_rate";
                 ESP_LOGD(TAG, "Sending instruction '%s=%i' to Nextion", definitive ? "bauds" : "baud", baud_rate);
                 disp1->send_command_printf("%s=%i", definitive ? "bauds" : "baud", baud_rate);
@@ -2584,9 +2583,8 @@ script:
             - wait_until:
                 condition:
                   - lambda: !lambda return (tf_uart->available() < 1);
-                timeout: 3s
+                timeout: 5s
             - lambda: |-
-                tf_uart->flush();
                 static const char *const TAG = "script.set_baud_rate";
                 ESP_LOGD(TAG, "Set ESPHome new baud rate to %i bps", baud_rate);
                 tf_uart->set_baud_rate(baud_rate);