diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index 036e0cd8a..4055b281a 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -112,8 +112,6 @@ static void shutdown() {
 	// TODO: Is this complete?
 	
 	nvicDisableVector(DMA_IRQn);
-
-	m0apptxevent_interrupt_disable();
 	
 	chSysDisable();
 
@@ -157,7 +155,7 @@ public:
 			dispatch(events);
 		}
 
-		shutdown();
+		m0apptxevent_interrupt_disable();
 	}
 
 	void request_stop() {
@@ -205,5 +203,7 @@ int main(void) {
 	EventDispatcher event_dispatcher;
 	event_dispatcher.run();
 
+	shutdown();
+
 	return 0;
 }