diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 4aa8785..76ff89b 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -26,12 +26,11 @@ api:
             - lambda: |- 
                 ESP_LOGW("Apollo", "Preventing Deep Sleep Due To OTA Or Switch");
                 id(deep_sleep_1).prevent_deep_sleep(); 
-          else: 
-            then:
-              - lambda: |-
-                  id(reportAllValues).execute();
-              - deep_sleep.enter:
-                  id: deep_sleep_1
+          else:
+            - lambda: |-
+                id(reportAllValues).execute();
+            - deep_sleep.enter:
+                id: deep_sleep_1
 
 globals:
   - id: cycleCounter
@@ -161,8 +160,6 @@ binary_sensor:
               // Remove Wifi
               id(testCycleCount) = 0;
               id(runTest) = true;
-              id(deep_sleep_run_duration).publish_state(60);
-              id(deep_sleep_sleep_duration).publish_state(60);
               id(prevent_sleep).turn_on();
               id(factory_reset_switch).turn_on();
             }