diff --git a/core/embed/firmware/main.c b/core/embed/firmware/main.c
index 0e6d58e44..f6f032bfa 100644
--- a/core/embed/firmware/main.c
+++ b/core/embed/firmware/main.c
@@ -53,6 +53,8 @@
 extern void shutdown_privileged(void);
 
 int main(void) {
+  random_delays_init();
+
 #ifdef RDI
   rdi_start();
 #endif
diff --git a/core/embed/firmware/startup.S b/core/embed/firmware/startup.S
index a0f3fb0d8..9d916951a 100644
--- a/core/embed/firmware/startup.S
+++ b/core/embed/firmware/startup.S
@@ -44,10 +44,6 @@ reset_handler:
   ldr r1, = __stack_chk_guard
   str r0, [r1]
 
-#ifdef RDI
-  bl random_delays_init
-#endif
-
   // re-enable exceptions
   // according to "ARM Cortex-M Programming Guide to Memory Barrier Instructions" Application Note 321, section 4.7:
   // "If it is not necessary to ensure that a pended interrupt is recognized immediately before