diff --git a/src/trx-client/trx-frontend/trx-frontend-http/src/api.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/api.rs
index 78f21c6..3e3f99e 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/src/api.rs
+++ b/src/trx-client/trx-frontend/trx-frontend-http/src/api.rs
@@ -1606,15 +1606,14 @@ pub async fn select_rig(
         )));
     }
 
-    if let Ok(mut active) = context.remote_active_rig_id.lock() {
-        *active = Some(rig_id.to_string());
-    }
-
-    // Update per-session rig selection if session_id is provided.
+    // Update per-session rig selection if session_id is provided, otherwise
+    // update the global default (for non-session-aware clients).
     if let Some(ref sid) = query.session_id {
         if let Ok(uuid) = Uuid::parse_str(sid) {
             session_rig_mgr.set_rig(uuid, rig_id.to_string());
         }
+    } else if let Ok(mut active) = context.remote_active_rig_id.lock() {
+        *active = Some(rig_id.to_string());
     }
 
     // Broadcast the channel list for the newly selected rig so all SSE