diff --git a/applications/message_handler/main.cpp b/applications/message_handler/main.cpp
index 8a36325..fa5f0b0 100644
--- a/applications/message_handler/main.cpp
+++ b/applications/message_handler/main.cpp
@@ -148,6 +148,13 @@
     printf("Starting input message task\n");
 
     IncomingMessageHandler process(*inputMessageQueue.toQueue(), mailbox, inferenceQueue, outputQueue);
+
+#ifdef MHU_IRQ
+    // Register mailbox interrupt handler
+    NVIC_SetVector((IRQn_Type)MHU_IRQ, (uint32_t)&mailboxIrqHandler);
+    NVIC_EnableIRQ((IRQn_Type)MHU_IRQ);
+#endif
+
     process.run();
 }
 
@@ -166,12 +173,6 @@
 int main() {
     BaseType_t ret;
 
-#ifdef MHU_IRQ
-    // Register mailbox interrupt handler
-    NVIC_SetVector((IRQn_Type)MHU_IRQ, (uint32_t)&mailboxIrqHandler);
-    NVIC_EnableIRQ((IRQn_Type)MHU_IRQ);
-#endif
-
     if (!mailbox.verifyHardware()) {
         printf("Failed to verify mailbox hardware\n");
         return 1;