diff --git a/firmware/application/baseband_api.cpp b/firmware/application/baseband_api.cpp
index a1eb30cbd..71c41fe9b 100644
--- a/firmware/application/baseband_api.cpp
+++ b/firmware/application/baseband_api.cpp
@@ -85,9 +85,13 @@ void stop() {
 
 void run_image(const portapack::spi_flash::region_t image_region) {
 	m4_init(image_region, portapack::memory::map::m4_code);
+
+	creg::m4txevent::enable();
 }
 
 void shutdown() {
+	creg::m4txevent::disable();
+
 	ShutdownMessage shutdown_message;
 	shared_memory.baseband_queue.push_and_wait(shutdown_message);
 }
diff --git a/firmware/application/event_m0.cpp b/firmware/application/event_m0.cpp
index 6d387cf0f..7966152aa 100644
--- a/firmware/application/event_m0.cpp
+++ b/firmware/application/event_m0.cpp
@@ -105,14 +105,10 @@ EventDispatcher::EventDispatcher(
 }
 
 void EventDispatcher::run() {
-	creg::m4txevent::enable();
-
 	while(is_running) {
 		const auto events = wait();
 		dispatch(events);
 	}
-
-	creg::m4txevent::disable();
 }
 
 void EventDispatcher::request_stop() {