diff --git a/src/trx-server/src/config.rs b/src/trx-server/src/config.rs
index a91746a..5d8fa25 100644
--- a/src/trx-server/src/config.rs
+++ b/src/trx-server/src/config.rs
@@ -54,7 +54,7 @@ pub struct RigInstanceConfig {
 impl Default for RigInstanceConfig {
     fn default() -> Self {
         Self {
-            id: "default".to_string(),
+            id: String::new(),  // Empty by default so auto-generation triggers in resolved_rigs()
             name: None,
             rig: RigConfig::default(),
             behavior: BehaviorConfig::default(),
diff --git a/src/trx-server/src/listener.rs b/src/trx-server/src/listener.rs
index d9f3c24..8bd983c 100644
--- a/src/trx-server/src/listener.rs
+++ b/src/trx-server/src/listener.rs
@@ -461,6 +461,7 @@ mod tests {
         let _state_tx = state_tx;
         let handle = RigHandle {
             rig_id: "default".to_string(),
+            display_name: "Default Rig".to_string(),
             rig_tx,
             state_rx,
             audio_port: 4531,