diff --git a/movement.c b/movement.c
index adc01871..186aaeb5 100644
--- a/movement.c
+++ b/movement.c
@@ -960,9 +960,6 @@ void app_setup(void) {
         }
 #endif
 
-        watch_enable_buzzer();
-        watch_enable_leds();
-
         movement_request_tick_frequency(1);
 
         for(uint8_t i = 0; i < MOVEMENT_NUM_FACES; i++) {
diff --git a/watch-library/hardware/watch/watch_tcc.c b/watch-library/hardware/watch/watch_tcc.c
index 06cee5d5..0e1fdd9d 100644
--- a/watch-library/hardware/watch/watch_tcc.c
+++ b/watch-library/hardware/watch/watch_tcc.c
@@ -317,9 +317,7 @@ void _watch_disable_tcc(void) {
 }
 
 void watch_enable_leds(void) {
-    if (!tcc_is_enabled(0)) {
-        _watch_enable_tcc();
-    }
+    watch_enable_buzzer_and_leds();
 }
 
 void watch_disable_leds(void) {