diff --git a/src/components/ha-selector/ha-selector-text.ts b/src/components/ha-selector/ha-selector-text.ts
index 89f764f626..3629ba3e22 100644
--- a/src/components/ha-selector/ha-selector-text.ts
+++ b/src/components/ha-selector/ha-selector-text.ts
@@ -10,7 +10,7 @@ import "../ha-textfield";
 
 @customElement("ha-selector-text")
 export class HaTextSelector extends LitElement {
-  @property() public hass!: HomeAssistant;
+  @property() public hass?: HomeAssistant;
 
   @property() public value?: any;
 
@@ -76,11 +76,11 @@ export class HaTextSelector extends LitElement {
       ${this.selector.text?.type === "password"
         ? html`<ha-icon-button
             toggles
-            .label=${this.hass.localize(
+            .label=${this.hass?.localize(
               this._unmaskedPassword
                 ? "ui.components.selectors.text.hide_password"
                 : "ui.components.selectors.text.show_password"
-            )}
+            ) || (this._unmaskedPassword ? "Hide password" : "Show password")}
             @click=${this._toggleUnmaskedPassword}
             .path=${this._unmaskedPassword ? mdiEyeOff : mdiEye}
           ></ha-icon-button>`