diff --git a/firmware/application/baseband_api.cpp b/firmware/application/baseband_api.cpp
index 10f5a92ae..a28be7777 100644
--- a/firmware/application/baseband_api.cpp
+++ b/firmware/application/baseband_api.cpp
@@ -115,6 +115,8 @@ void shutdown() {
 	ShutdownMessage message;
 	send_message(&message);
 
+	shared_memory.application_queue.reset();
+	
 	baseband_image_running = false;
 }
 
diff --git a/firmware/common/message_queue.hpp b/firmware/common/message_queue.hpp
index 3e0a1cbb4..84bbaa9cf 100644
--- a/firmware/common/message_queue.hpp
+++ b/firmware/common/message_queue.hpp
@@ -74,6 +74,10 @@ public:
 		return fifo.is_empty();
 	}
 
+	void reset() {
+		fifo.reset();
+	}
+	
 private:
 	FIFO<uint8_t> fifo;
 	Mutex mutex_write;