diff --git a/src/panels/config/automation/action/ha-automation-action-row.ts b/src/panels/config/automation/action/ha-automation-action-row.ts
index 1ff7f143d2..8c58ca65ef 100644
--- a/src/panels/config/automation/action/ha-automation-action-row.ts
+++ b/src/panels/config/automation/action/ha-automation-action-row.ts
@@ -145,7 +145,7 @@ export default class HaAutomationActionRow extends LitElement {
           : ""}
         <ha-expansion-panel
           leftChevron
-          .header=${describeAction(this.hass, this.action)}
+          .header=${this.action.alias || describeAction(this.hass, this.action)}
         >
           ${this.index !== 0
             ? html`
diff --git a/src/panels/config/automation/action/types/ha-automation-action-service.ts b/src/panels/config/automation/action/types/ha-automation-action-service.ts
index fdac1e1824..69f87c3583 100644
--- a/src/panels/config/automation/action/types/ha-automation-action-service.ts
+++ b/src/panels/config/automation/action/types/ha-automation-action-service.ts
@@ -10,6 +10,7 @@ import type { HomeAssistant } from "../../../../../types";
 import { ActionElement } from "../ha-automation-action-row";
 
 const actionStruct = object({
+  alias: optional(string()),
   service: optional(string()),
   entity_id: optional(entityIdOrAll()),
   target: optional(any()),
diff --git a/src/panels/config/automation/condition/ha-automation-condition-row.ts b/src/panels/config/automation/condition/ha-automation-condition-row.ts
index fd77ce8783..aa2eb92746 100644
--- a/src/panels/config/automation/condition/ha-automation-condition-row.ts
+++ b/src/panels/config/automation/condition/ha-automation-condition-row.ts
@@ -80,7 +80,7 @@ export default class HaAutomationConditionRow extends LitElement {
 
         <ha-expansion-panel
           leftChevron
-          .header=${describeCondition(this.condition)}
+          .header=${this.condition.alias || describeCondition(this.condition)}
         >
           <ha-progress-button slot="icons" @click=${this._testCondition}>
             ${this.hass.localize(
diff --git a/src/panels/config/automation/condition/types/ha-automation-condition-state.ts b/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
index d34264466c..ca5c923f85 100644
--- a/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
+++ b/src/panels/config/automation/condition/types/ha-automation-condition-state.ts
@@ -12,6 +12,7 @@ import { forDictStruct } from "../../structs";
 import type { ConditionElement } from "../ha-automation-condition-row";
 
 const stateConditionStruct = object({
+  alias: optional(string()),
   condition: literal("state"),
   entity_id: optional(string()),
   attribute: optional(string()),