diff --git a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
index 0f3b48b..5048380 100644
--- a/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
+++ b/src/trx-client/trx-frontend/trx-frontend-http/assets/web/app.js
@@ -80,6 +80,12 @@ function showAuthGate(allowGuest = false) {
   document.getElementById("auth-gate").style.display = "block";
   document.getElementById("tab-bar").style.display = "none";
 
+  // Hide rig picker since no rigs are accessible without auth
+  const rigSwitch = document.querySelector(".header-rig-switch");
+  if (rigSwitch) {
+    rigSwitch.style.display = "none";
+  }
+
   // Hide all tab panels
   document.querySelectorAll(".tab-panel").forEach(panel => {
     panel.style.display = "none";
@@ -97,6 +103,12 @@ function hideAuthGate() {
   document.getElementById("loading").style.display = "block";
   document.getElementById("tab-bar").style.display = "";
 
+  // Show rig picker again now that user is authenticated
+  const rigSwitch = document.querySelector(".header-rig-switch");
+  if (rigSwitch) {
+    rigSwitch.style.display = "";
+  }
+
   // Show Main tab by default and hide all other tabs
   document.querySelectorAll(".tab-panel").forEach(panel => {
     panel.style.display = "none";