diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index e601d2df..95536bbe 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -141,6 +141,9 @@ public:
 			}
 		);
 
+		events_initialize(chThdSelf());
+		m0apptxevent_interrupt_enable();
+
 		baseband_thread.thread_main = chThdSelf();
 		baseband_thread.thread_rssi = rssi_thread.start(NORMALPRIO + 10);
 		baseband_thread.start(NORMALPRIO + 20);
@@ -191,9 +194,6 @@ private:
 int main(void) {
 	init();
 
-	events_initialize(chThdSelf());
-	m0apptxevent_interrupt_enable();
-
 	/* TODO: Ensure DMAs are configured to point at first LLI in chain. */
 
 	touch::dma::allocate();