diff --git a/everything-presence-one-beta.yaml b/everything-presence-one-beta.yaml
index 606c006..d653fa7 100644
--- a/everything-presence-one-beta.yaml
+++ b/everything-presence-one-beta.yaml
@@ -153,7 +153,7 @@ switch:
     disabled_by_default: True
     entity_category: config
     optimistic: true
-    restore_state: true
+    restore_mode: RESTORE_DEFAULT_ON
     turn_on_action:
       - uart.write: "sensorStart"
       - delay: 1s
@@ -167,7 +167,6 @@ switch:
     entity_category: config
     internal: ${uart_presence_output_disabled}
     optimistic: true
-    restore_state: true
     turn_on_action:
       - switch.turn_off: mmwave_sensor
       - delay: 1s
@@ -191,7 +190,6 @@ switch:
     entity_category: config
     internal: ${uart_target_output_disabled}
     optimistic: true
-    restore_state: true
     assumed_state: false
     restore_mode: ALWAYS_ON
     turn_on_action:
diff --git a/everything-presence-one-st.yaml b/everything-presence-one-st.yaml
index bacde29..57cee29 100644
--- a/everything-presence-one-st.yaml
+++ b/everything-presence-one-st.yaml
@@ -122,7 +122,7 @@ switch:
     id: "mmwave_sensor"
     entity_category: config
     optimistic: true
-    restore_state: true
+    restore_mode: RESTORE_DEFAULT_ON
     turn_on_action:
       - uart.write: "sensorStart"
       - delay: 1s
@@ -135,7 +135,7 @@ switch:
     id: "mmwave_led"
     entity_category: config
     optimistic: true
-    restore_state: true
+    restore_mode: RESTORE_DEFAULT_OFF
     turn_on_action:
       - switch.turn_off: mmwave_sensor
       - delay: 1s
@@ -159,7 +159,6 @@ switch:
     entity_category: config
     internal: ${uart_presence_output_disabled}
     optimistic: true
-    restore_state: true
     turn_on_action:
       - switch.turn_off: mmwave_sensor
       - delay: 1s
@@ -183,7 +182,6 @@ switch:
     entity_category: config
     internal: ${uart_target_output_disabled}
     optimistic: true
-    restore_state: true
     assumed_state: false
     turn_on_action:
       - switch.turn_off: mmwave_sensor