diff --git a/src/event.c b/src/event.c
index 0c904c38f..2290be233 100644
--- a/src/event.c
+++ b/src/event.c
@@ -597,6 +597,7 @@ int rig_fire_freq_event(RIG *rig, vfo_t vfo, freq_t freq)
               (int64_t)freq, rig_strvfo(vfo));
 
     rig_set_cache_freq(rig, vfo, freq);
+    rig->state.use_cached_freq = 1;
 
     network_publish_rig_transceive_data(rig);
 
@@ -617,6 +618,7 @@ int rig_fire_mode_event(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
               rig_strrmode(mode), width, rig_strvfo(vfo));
 
     rig_set_cache_mode(rig, vfo, mode, width);
+    rig->state.use_cached_mode = 1;
 
     network_publish_rig_transceive_data(rig);