diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index fd6cfb7db18e446ac8eff23a5f4fd9a444e7cc4c..d92c02472012ec78be2a6bff0c3b23d0bdc58c94 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -594,7 +594,6 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             if (this->base_mode != state.base_mode || this->custom_mode != state.custom_mode)
             {
                 modechanged = true;
-                receivedMode = true;
                 this->base_mode = state.base_mode;
                 this->custom_mode = state.custom_mode;
                 shortModeText = getShortModeTextFor(this->base_mode, this->custom_mode, this->autopilot);
@@ -604,6 +603,9 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 modeAudio = " is now in " + audiomodeText;
             }
 
+            // We got the mode
+            receivedMode = true;
+
             // AUDIO
             if (modechanged && statechanged)
             {