diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
index d4b1a1753d..50fec942a5 100644
--- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts
+++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts
@@ -63,11 +63,9 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
 
     const stateObj = this.hass.states[this._config.entity];
 
-    if (!stateObj) {
-      return 0;
-    }
-
-    return stateObj.attributes.code_format !== FORMAT_NUMBER ? 3 : 8;
+    return !stateObj || stateObj.attributes.code_format !== FORMAT_NUMBER
+      ? 3
+      : 8;
   }
 
   public setConfig(config: Config): void {
diff --git a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
index d5a3dad07b..969a48f2e6 100644
--- a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
@@ -57,7 +57,7 @@ export class HuiAlarmPanelCardEditor extends LitElement
       return html``;
     }
 
-    const states = ["arm_home", "arm_away", "arm_night", "armed_custom_bypass"];
+    const states = ["arm_home", "arm_away", "arm_night", "arm_custom_bypass"];
 
     return html`
       ${configElementStyle} ${this.renderStyle()}
diff --git a/src/translations/en.json b/src/translations/en.json
index d20f31f8cf..051b352259 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -346,7 +346,7 @@
         "arm_home": "Arm home",
         "arm_away": "Arm away",
         "arm_night": "Arm night",
-        "armed_custom_bypass": "Custom bypass"
+        "arm_custom_bypass": "Custom bypass"
       },
       "automation": {
         "last_triggered": "Last triggered",