diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index 2e0f6fe717..6340fbbc41 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -38,8 +38,8 @@ void main(void)
     int i;
     unsigned char buf[8];
 
-    kernel_init();
     system_init();
+    kernel_init();
 
     lcd_init();
 
diff --git a/firmware/target/arm/as3525/kernel-as3525.c b/firmware/target/arm/as3525/kernel-as3525.c
index 08d6128bb7..73031b9eb5 100644
--- a/firmware/target/arm/as3525/kernel-as3525.c
+++ b/firmware/target/arm/as3525/kernel-as3525.c
@@ -32,6 +32,9 @@ void INT_TIMER2(void)
 
 void tick_start(unsigned int interval_in_ms)
 {
+#ifdef BOOTLOADER
+    (void) interval_in_ms;
+#else
     int phi = 0;                            /* prescaler bits */
     int prescale = 1;
     int cycles = 64000 * interval_in_ms;    /* pclk is clocked at 64MHz */
@@ -54,4 +57,5 @@ void tick_start(unsigned int interval_in_ms)
     /* /!\ bit 4 (reserved) must not be modified
      * periodic mode, interrupt enabled, 16 bits counter */
     TIMER2_CONTROL = (TIMER2_CONTROL & (1<<4)) | 0xe0 | (phi<<2);
+#endif
 }