diff --git a/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
index 894aea4fd3..bece976ab9 100644
--- a/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/kernel-gigabeat-s.c
@@ -72,7 +72,9 @@ void kernel_device_init(void)
     mc13783_init();
     dvfs_dptc_init();
     dvfs_wfi_monitor(true); /* Monitor the WFI signal */
+#ifndef BOOTLOADER
     dvfs_dptc_start(); /* Should be ok to start even so early */
+#endif
 }
 
 void tick_stop(void)