diff --git a/firmware/common/portapack_shared_memory.hpp b/firmware/common/portapack_shared_memory.hpp
index df8b68d7..3310f033 100644
--- a/firmware/common/portapack_shared_memory.hpp
+++ b/firmware/common/portapack_shared_memory.hpp
@@ -36,10 +36,10 @@ struct SharedMemory {
 	static constexpr size_t baseband_queue_k = 11;
 	static constexpr size_t application_queue_k = 11;
 
-	MessageQueue baseband_queue;
 	uint8_t baseband_queue_data[1 << baseband_queue_k];
-	MessageQueue application_queue;
 	uint8_t application_queue_data[1 << application_queue_k];
+	MessageQueue baseband_queue;
+	MessageQueue application_queue;
 
 	// TODO: M0 should directly configure and control DMA channel that is
 	// acquiring ADC samples.