diff --git a/supersensor.yaml b/supersensor.yaml
index 6b90cdd..69388a8 100644
--- a/supersensor.yaml
+++ b/supersensor.yaml
@@ -52,9 +52,6 @@ esphome:
         - delay: 2s
         - switch.turn_on: use_wake_word
         - delay: 2s
-        - switch.turn_off: use_wake_word
-        - delay: 2s
-        - switch.turn_on: use_wake_word
         - light.turn_off:
             id: output_led
 
@@ -136,6 +133,10 @@ voice_assistant:
   auto_gain: 31dBFS
   volume_multiplier: 4.0
   id: assist
+  on_error:
+    - logger.log: "Voice Assistant encountered an error; restarting it"
+    - switch.turn_on: use_wake_word
+    - switch.turn_off: use_wake_word
   on_wake_word_detected:
     - light.turn_off:
         id: output_led