diff --git a/firmware/src/init.c b/firmware/src/init.c
index 2073d2b..dd7f170 100644
--- a/firmware/src/init.c
+++ b/firmware/src/init.c
@@ -81,8 +81,8 @@ void init(enum init_type init_t)
    * we need to switch to a stable low frequency clock right away.
    * --------------------------------------------------------------------------
    */
-  lf_clock_startup();              /* ~500ms startup */
-  gclk0_to_lf_clock();          /* switch, clocking at 32kHz now */
+  lf_clock_startup();              /* 100-200ms startup */
+  gclk0_to_lf_clock();             /* switch, clocking at 32kHz now */
   system_clock_source_disable(SYSTEM_CLOCK_SOURCE_OSC8M);
 
   /**
diff --git a/firmware/src/xosc.c b/firmware/src/xosc.c
index a84794f..9ac0326 100644
--- a/firmware/src/xosc.c
+++ b/firmware/src/xosc.c
@@ -139,7 +139,7 @@ void lf_clock_startup(void)
 #if USE_LFTIMER
   /* Setup XOSC  */
   system_clock_source_xosc32k_set_config(SYSTEM_CLOCK_EXTERNAL_CLOCK,
-                                         SYSTEM_XOSC32K_STARTUP_16384, /* ~500ms startup*/
+                                         SYSTEM_XOSC32K_STARTUP_4096, /* 100-200ms startup*/
                                          false,
                                          false,
                                          true,