diff --git a/src/trx-core/src/rig/controller/handlers.rs b/src/trx-core/src/rig/controller/handlers.rs
index f6f2e5e..87e4b0b 100644
--- a/src/trx-core/src/rig/controller/handlers.rs
+++ b/src/trx-core/src/rig/controller/handlers.rs
@@ -504,6 +504,9 @@ pub fn command_from_rig_command(cmd: RigCommand) -> Box<dyn RigCommandHandler> {
         // map to GetSnapshot as a safe fallback.
         RigCommand::SetAprsDecodeEnabled(_)
         | RigCommand::SetCwDecodeEnabled(_)
+        | RigCommand::SetCwAuto(_)
+        | RigCommand::SetCwWpm(_)
+        | RigCommand::SetCwToneHz(_)
         | RigCommand::ResetAprsDecoder
         | RigCommand::ResetCwDecoder => Box::new(GetSnapshotCommand),
     }