diff --git a/demo/src/configs/arsaboo/lovelace.ts b/demo/src/configs/arsaboo/lovelace.ts
index 5dbf740726..e1e6e9e45d 100644
--- a/demo/src/configs/arsaboo/lovelace.ts
+++ b/demo/src/configs/arsaboo/lovelace.ts
@@ -596,7 +596,7 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
         {
           type: "alarm-panel",
           entity: "alarm_control_panel.abode_alarm",
-          title: "Abode",
+          name: "Abode",
           states: ["arm_home", "arm_away"],
         },
         {
diff --git a/src/panels/lovelace/editor/config-elements/hui-entity-button-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entity-button-card-editor.ts
index 9c13aebf7f..6569ee8b5c 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entity-button-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entity-button-card-editor.ts
@@ -29,8 +29,8 @@ const cardConfigStruct = struct({
   entity: "string?",
   name: "string?",
   icon: "string?",
-  tap_action: actionConfigStruct,
-  hold_action: actionConfigStruct,
+  tap_action: struct.optional(actionConfigStruct),
+  hold_action: struct.optional(actionConfigStruct),
   theme: "string?",
 });
 
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
index 6d852fd534..b400bec3aa 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
@@ -25,8 +25,8 @@ import "../../components/hui-action-editor";
 const cardConfigStruct = struct({
   type: "string",
   image: "string?",
-  tap_action: actionConfigStruct,
-  hold_action: actionConfigStruct,
+  tap_action: struct.optional(actionConfigStruct),
+  hold_action: struct.optional(actionConfigStruct),
 });
 
 export class HuiPictureCardEditor extends hassLocalizeLitMixin(LitElement)