From c3c4bb4421ff31fade352afc7a4ee9582867f257 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 5 Sep 2023 13:29:47 +0200
Subject: [PATCH] Fix initial value of select selector (#17822)

---
 src/components/ha-form/compute-initial-ha-form-data.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/ha-form/compute-initial-ha-form-data.ts b/src/components/ha-form/compute-initial-ha-form-data.ts
index 8844e2d9e0..d3c7e2b847 100644
--- a/src/components/ha-form/compute-initial-ha-form-data.ts
+++ b/src/components/ha-form/compute-initial-ha-form-data.ts
@@ -27,7 +27,8 @@ export const computeInitialHaFormData = (
       data[field.name] = 0.0;
     } else if (field.type === "select") {
       if (field.options.length) {
-        data[field.name] = field.options[0][0];
+        const val = field.options[0];
+        data[field.name] = Array.isArray(val) ? val[0] : val;
       }
     } else if (field.type === "positive_time_period_dict") {
       data[field.name] = {
@@ -61,7 +62,7 @@ export const computeInitialHaFormData = (
       } else if ("select" in selector) {
         if (selector.select?.options.length) {
           const val = selector.select.options[0];
-          data[field.name] = Array.isArray(val) ? val[0] : val;
+          data[field.name] = typeof val === "string" ? val : val.value;
         }
       } else if ("duration" in selector) {
         data[field.name] = {