diff --git a/Configuration.cpp b/Configuration.cpp
index 5674a1b81..9527c2372 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -2327,6 +2327,7 @@ void Configuration::impl::handle_transceiver_update (TransceiverState const& sta
   // only follow rig on some information, ignore other stuff
   cached_rig_state_.online (state.online ());
   cached_rig_state_.frequency (state.frequency ());
+  cached_rig_state_.mode (state.mode ());
   cached_rig_state_.split (state.split ());
 
   if (state.online ())
diff --git a/TransceiverBase.cpp b/TransceiverBase.cpp
index ed2868739..7e2483652 100644
--- a/TransceiverBase.cpp
+++ b/TransceiverBase.cpp
@@ -209,6 +209,7 @@ void TransceiverBase::update_split (bool state)
 void TransceiverBase::update_mode (MODE m)
 {
   actual_.mode (m);
+  requested_.mode (m);    // track rig changes
 }
 
 void TransceiverBase::update_PTT (bool state)