diff --git a/firmware/baseband/event_m4.cpp b/firmware/baseband/event_m4.cpp
index 49c98caf1..c1b395b2b 100644
--- a/firmware/baseband/event_m4.cpp
+++ b/firmware/baseband/event_m4.cpp
@@ -92,7 +92,6 @@ void EventDispatcher::handle_baseband_queue() {
 	const auto message = shared_memory.baseband_message;
 	if( message ) {
 		on_message(message);
-		shared_memory.baseband_message = nullptr;
 	}
 }
 
@@ -104,6 +103,7 @@ void EventDispatcher::on_message(const Message* const message) {
 
 	default:
 		on_message_default(message);
+		shared_memory.baseband_message = nullptr;
 		break;
 	}
 }