diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index 1edf47137..2a8e567cb 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -109,6 +109,9 @@ static void shutdown() {
 	chSysDisable();
 
 	systick_stop();
+
+	ShutdownMessage shutdown_message;
+	shared_memory.application_queue.push(shutdown_message);
 }
 
 static void halt() {
@@ -202,9 +205,6 @@ int main(void) {
 
 	shutdown();
 
-	ShutdownMessage shutdown_message;
-	shared_memory.application_queue.push(shutdown_message);
-
 	halt();
 
 	return 0;