diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index 122bb1c1..5bd13990 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -3151,14 +3151,10 @@ script:
           ESP_LOGI("script.set_timezone", "Setting timezone: %s", timezone.c_str());
           if (timezone != id(mui_timezone)) {
             id(mui_timezone) = timezone;
-            if (timezone.empty())
-              arch_restart();  // Restart when timezone is set to blank so it uses the one from ESPHome compiller
             size_t start = id(mui_timezone).find('<');
             size_t end = id(mui_timezone).find('>');
             if (start != std::string::npos && end != std::string::npos && end > start)
               id(mui_timezone).replace(start, (end - start) + 1, "UTC");
-            if (id(mui_timezone).empty())
-              arch_restart();  // Restart when timezone is set to blank so it uses the one from ESPHome compiller
             time_provider->set_timezone(id(mui_timezone).c_str());
             time_provider->call_setup();
           }
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 2e7324cd..9309169e 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -8196,23 +8196,20 @@ action:
                             qrcode: !input qrcode_value
                           home_indoor_temp_icon: !input home_indoor_temp_icon
                           timezone: !input timezone
+                          timezone_code: >
+                            {{
+                              timezone.split('(')[1]|replace(')', '')
+                              if timezone.split('(') | count > 0
+                              else timezone
+                            }}
 
                       ##### Timezone #####
-                      - if: '{{ timezone is string and timezone | length > 1 }}'
-                        then:
-                          - variables:
-                              timezone_code: >
-                                {{
-                                  timezone.split('(')[1]|replace(')', '')
-                                  if timezone.split('(') | count > 0
-                                  else timezone
-                                }}
-                          - *delay_default
-                          - service: 'esphome.{{ nspanel_name }}_set_string'
-                            data:
-                              component: "timezone"
-                              val: '{{ timezone_code }}'
-                            continue_on_error: true
+                      - *delay_default
+                      - service: 'esphome.{{ nspanel_name }}_set_string'
+                        data:
+                          component: "timezone"
+                          val: '{{ timezone_code }}'
+                        continue_on_error: true
 
                       ##### Home page #####
                       - *delay_default
diff --git a/prebuilt/nspanel-esp32/manifest.json b/prebuilt/nspanel-esp32/manifest.json
index adce39b4..d22c5d5b 100644
--- a/prebuilt/nspanel-esp32/manifest.json
+++ b/prebuilt/nspanel-esp32/manifest.json
@@ -2,7 +2,7 @@
   "chipFamily": "ESP32",
   "ota": {
     "path": "nspanel-esp32.ota.bin",
-    "md5": "535570dc8d4ad4661d4bef93df314749"
+    "md5": "d4cb0c8bdc8809f8802dc49541f3015a"
   },
   "parts": [
     {
diff --git a/prebuilt/nspanel-esp32/nspanel-esp32.factory.bin b/prebuilt/nspanel-esp32/nspanel-esp32.factory.bin
index 7b6a1a6b..3c508233 100644
Binary files a/prebuilt/nspanel-esp32/nspanel-esp32.factory.bin and b/prebuilt/nspanel-esp32/nspanel-esp32.factory.bin differ
diff --git a/prebuilt/nspanel-esp32/nspanel-esp32.ota.bin b/prebuilt/nspanel-esp32/nspanel-esp32.ota.bin
index 60724469..b2f240f9 100644
Binary files a/prebuilt/nspanel-esp32/nspanel-esp32.ota.bin and b/prebuilt/nspanel-esp32/nspanel-esp32.ota.bin differ
diff --git a/prebuilt/nspanel_esphome_prebuilt.bin b/prebuilt/nspanel_esphome_prebuilt.bin
index 60724469..b2f240f9 100644
Binary files a/prebuilt/nspanel_esphome_prebuilt.bin and b/prebuilt/nspanel_esphome_prebuilt.bin differ
diff --git a/prebuilt/nspanel_esphome_prebuilt.bin.md5 b/prebuilt/nspanel_esphome_prebuilt.bin.md5
index 130ad149..ec60ceb9 100644
--- a/prebuilt/nspanel_esphome_prebuilt.bin.md5
+++ b/prebuilt/nspanel_esphome_prebuilt.bin.md5
@@ -1 +1 @@
-535570dc8d4ad4661d4bef93df314749  prebuilt/nspanel_esphome_prebuilt.bin
+d4cb0c8bdc8809f8802dc49541f3015a  prebuilt/nspanel_esphome_prebuilt.bin
diff --git a/prebuilt/nspanel_esphome_prebuilt.factory.bin b/prebuilt/nspanel_esphome_prebuilt.factory.bin
index 7b6a1a6b..3c508233 100644
Binary files a/prebuilt/nspanel_esphome_prebuilt.factory.bin and b/prebuilt/nspanel_esphome_prebuilt.factory.bin differ
diff --git a/prebuilt/nspanel_esphome_prebuilt.factory.bin.md5 b/prebuilt/nspanel_esphome_prebuilt.factory.bin.md5
index d984cab0..c43c6336 100644
--- a/prebuilt/nspanel_esphome_prebuilt.factory.bin.md5
+++ b/prebuilt/nspanel_esphome_prebuilt.factory.bin.md5
@@ -1 +1 @@
-c4b148a85bfdcc295fb5e8d684976638  prebuilt/nspanel_esphome_prebuilt.factory.bin
+93a7945b78c6f45ba470e32825b2567a  prebuilt/nspanel_esphome_prebuilt.factory.bin
diff --git a/prebuilt/nspanel_esphome_prebuilt.manifest.json b/prebuilt/nspanel_esphome_prebuilt.manifest.json
index adce39b4..d22c5d5b 100644
--- a/prebuilt/nspanel_esphome_prebuilt.manifest.json
+++ b/prebuilt/nspanel_esphome_prebuilt.manifest.json
@@ -2,7 +2,7 @@
   "chipFamily": "ESP32",
   "ota": {
     "path": "nspanel-esp32.ota.bin",
-    "md5": "535570dc8d4ad4661d4bef93df314749"
+    "md5": "d4cb0c8bdc8809f8802dc49541f3015a"
   },
   "parts": [
     {
diff --git a/prebuilt/wall-display-esp32/manifest.json b/prebuilt/wall-display-esp32/manifest.json
index 1e03d9c0..72bac9dd 100644
--- a/prebuilt/wall-display-esp32/manifest.json
+++ b/prebuilt/wall-display-esp32/manifest.json
@@ -2,7 +2,7 @@
   "chipFamily": "ESP32",
   "ota": {
     "path": "wall-display-esp32.ota.bin",
-    "md5": "6fb3f43dfb1b516569d77746a726ab88"
+    "md5": "391baa1e618d74b8567cd02efe638e69"
   },
   "parts": [
     {
diff --git a/prebuilt/wall-display-esp32/wall-display-esp32.factory.bin b/prebuilt/wall-display-esp32/wall-display-esp32.factory.bin
index a5a37746..187a976d 100644
Binary files a/prebuilt/wall-display-esp32/wall-display-esp32.factory.bin and b/prebuilt/wall-display-esp32/wall-display-esp32.factory.bin differ
diff --git a/prebuilt/wall-display-esp32/wall-display-esp32.ota.bin b/prebuilt/wall-display-esp32/wall-display-esp32.ota.bin
index e4ac0159..fd8dc4a8 100644
Binary files a/prebuilt/wall-display-esp32/wall-display-esp32.ota.bin and b/prebuilt/wall-display-esp32/wall-display-esp32.ota.bin differ
diff --git a/prebuilt/wall_display.bin b/prebuilt/wall_display.bin
index e4ac0159..fd8dc4a8 100644
Binary files a/prebuilt/wall_display.bin and b/prebuilt/wall_display.bin differ
diff --git a/prebuilt/wall_display.bin.md5 b/prebuilt/wall_display.bin.md5
index 7d6e509a..fdd3ddae 100644
--- a/prebuilt/wall_display.bin.md5
+++ b/prebuilt/wall_display.bin.md5
@@ -1 +1 @@
-6fb3f43dfb1b516569d77746a726ab88  prebuilt/wall_display.bin
+391baa1e618d74b8567cd02efe638e69  prebuilt/wall_display.bin
diff --git a/prebuilt/wall_display.factory.bin b/prebuilt/wall_display.factory.bin
index a5a37746..187a976d 100644
Binary files a/prebuilt/wall_display.factory.bin and b/prebuilt/wall_display.factory.bin differ
diff --git a/prebuilt/wall_display.factory.bin.md5 b/prebuilt/wall_display.factory.bin.md5
index 4b662cae..512c733b 100644
--- a/prebuilt/wall_display.factory.bin.md5
+++ b/prebuilt/wall_display.factory.bin.md5
@@ -1 +1 @@
-25677ea3fb0d876dfac0512aacc3057b  prebuilt/wall_display.factory.bin
+7f27de2296979005184c8f14521c923f  prebuilt/wall_display.factory.bin
diff --git a/prebuilt/wall_display.manifest.json b/prebuilt/wall_display.manifest.json
index 1e03d9c0..72bac9dd 100644
--- a/prebuilt/wall_display.manifest.json
+++ b/prebuilt/wall_display.manifest.json
@@ -2,7 +2,7 @@
   "chipFamily": "ESP32",
   "ota": {
     "path": "wall-display-esp32.ota.bin",
-    "md5": "6fb3f43dfb1b516569d77746a726ab88"
+    "md5": "391baa1e618d74b8567cd02efe638e69"
   },
   "parts": [
     {