diff --git a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
index 382489a..91371ca 100644
--- a/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+++ b/advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
@@ -221,8 +221,8 @@ script:
           std::string branch = tft_file_branch->state;
           std::string model = tft_file_model->state;
           ESP_LOGD(TAG, "TFT URL set:");
-          ESP_LOGD(TAG, "  Branch: %s", branch.c_str());
-          ESP_LOGD(TAG, "  Model:  %s", model.c_str());
+          ESP_LOGD(TAG, "  Branch:   %s", branch.c_str());
+          ESP_LOGD(TAG, "  Model:    %s", model.c_str());
           if (id(is_restored_settings) and tft_file_branch->active_index().has_value())
             id(tft_branch) = tft_file_branch->active_index().value();
           if (id(is_restored_settings) and tft_file_model->active_index().has_value())
@@ -250,11 +250,11 @@ script:
               if (std::string::npos != endPos) {
                   url = url.substr(0, endPos + 1);
               }
-
-              ESP_LOGD(TAG, "Full URL: %s", url.c_str());
-              id(tft_url) = url;
-              disp1->set_tft_url(url.c_str());
             }
+
+            ESP_LOGD(TAG, "  Full URL: %s", url.c_str());
+            id(tft_url) = url;
+            disp1->set_tft_url(url.c_str());
           }
 
   - id: upload_tft  # I've changed this to use ESPHome commands to avoid the parallelism from lambdas
diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml
index 66ad682..d372ba1 100644
--- a/advanced/esphome/nspanel_esphome_core.yaml
+++ b/advanced/esphome/nspanel_esphome_core.yaml
@@ -14,7 +14,7 @@ substitutions:
   ota_password: ${wifi_password}
   ap_password: ${wifi_password}
   ##### DON'T CHANGE THIS ######
-  version: "4.2beta.5"
+  version: "4.2beta.6"
   ##############################
 
 ##### External components #####