diff --git a/packages/common/src/webrtc/BaseCall.ts b/packages/common/src/webrtc/BaseCall.ts
index 090a6f78..607cb851 100644
--- a/packages/common/src/webrtc/BaseCall.ts
+++ b/packages/common/src/webrtc/BaseCall.ts
@@ -266,10 +266,17 @@ export default abstract class BaseCall implements IWebRTCCall {
         audio: { deviceId: { exact: deviceId } },
       })
       const audioTrack = newStream.getAudioTracks()[0]
+
+      // Preserve the enabled state from the old audio track
+      const { localStream } = this.options
+      const oldAudioTracks = localStream.getAudioTracks()
+      if (oldAudioTracks.length > 0) {
+        audioTrack.enabled = oldAudioTracks[0].enabled
+      }
+
       sender.replaceTrack(audioTrack)
       this.options.micId = deviceId
 
-      const { localStream } = this.options
       localStream.getAudioTracks().forEach((t) => t.stop())
       localStream.getVideoTracks().forEach((t) => newStream.addTrack(t))
       this.options.localStream = newStream
@@ -299,8 +306,15 @@ export default abstract class BaseCall implements IWebRTCCall {
         video: { deviceId: { exact: deviceId } },
       })
       const videoTrack = newStream.getVideoTracks()[0]
-      sender.replaceTrack(videoTrack)
+
+      // Preserve the enabled state from the old video track
       const { localElement, localStream } = this.options
+      const oldVideoTracks = localStream.getVideoTracks()
+      if (oldVideoTracks.length > 0) {
+        videoTrack.enabled = oldVideoTracks[0].enabled
+      }
+
+      sender.replaceTrack(videoTrack)
       attachMediaStream(localElement, newStream)
       this.options.camId = deviceId
 
diff --git a/packages/js/examples/flask-mute-test/.gitignore b/packages/js/examples/flask-mute-test/.gitignore
new file mode 100644
index 00000000..93a464bb
--- /dev/null
+++ b/packages/js/examples/flask-mute-test/.gitignore
@@ -0,0 +1 @@
+static/
\ No newline at end of file
diff --git a/packages/js/examples/flask-mute-test/README.md b/packages/js/examples/flask-mute-test/README.md
new file mode 100644
index 00000000..9b232bb5
--- /dev/null
+++ b/packages/js/examples/flask-mute-test/README.md
@@ -0,0 +1,225 @@
+# SignalWire Audio Mute Fix Test - Flask Edition
+
+This Flask application provides an automated testing environment for verifying the audio mute state preservation fix in the SignalWire JavaScript SDK. It automatically generates JWT tokens and provides a comprehensive test interface.
+
+## 🎯 What This Tests
+
+This application tests the fix for a critical issue where:
+- **Problem**: When a call was muted using `call.muteAudio()`, switching audio input devices with `call.setAudioInDevice()` would create a new audio track that was unmuted, losing the mute state.
+- **Fix**: The SDK now preserves the `enabled` state from the old audio track when creating a new track during device switching.
+
+## 🚀 Quick Start
+
+### Prerequisites
+
+1. **Python 3.7+** installed
+2. **SignalWire Account** with:
+   - Space (e.g., `your-space.signalwire.com`)
+   - Project ID
+   - API Token
+3. **Multiple Audio Devices** (built-in mic + USB headset, etc.) for testing
+
+### Setup
+
+1. **Clone and navigate to the example**:
+   ```bash
+   cd packages/js/examples/flask-mute-test
+   ```
+
+2. **Install Python dependencies**:
+   ```bash
+   pip install -r requirements.txt
+   ```
+
+3. **Set environment variables**:
+   ```bash
+   export SIGNALWIRE_SPACE="your-space.signalwire.com"
+   export SIGNALWIRE_PROJECT_ID="your-project-id-here"
+   export SIGNALWIRE_TOKEN="your-api-token-here"
+   ```
+
+   Or create a `.env` file:
+   ```bash
+   SIGNALWIRE_SPACE=your-space.signalwire.com
+   SIGNALWIRE_PROJECT_ID=your-project-id-here
+   SIGNALWIRE_TOKEN=your-api-token-here
+   ```
+
+4. **Build and copy the SDK** (to use the local version with the mute fix):
+   ```bash
+   ./build-and-copy-sdk.sh
+   ```
+
+5. **Run the Flask application**:
+   ```bash
+   python app.py
+   ```
+
+6. **Open your browser**:
+   - Navigate to `http://localhost:3000`
+   - The JWT token will be automatically generated and displayed
+
+## 🧪 Running the Test
+
+### Automated Test
+
+1. **Connect**: Click "Connect to SignalWire" - JWT is auto-generated
+2. **Make a Call**: Enter destination/source numbers and click "Start Call"
+3. **Wait for Active**: Once call is active, the test button will be enabled
+4. **Run Test**: Click "🧪 Run Mute Fix Test" to execute the automated test sequence
+
+### Manual Test
+
+You can also manually test using the controls that appear when a call is active:
+- **Mute/Unmute Audio**: Toggle audio mute state
+- **Device Selection**: Switch between available audio input devices
+- **Real-time Feedback**: Watch the console log and button states
+
+## 📋 Test Sequence
+
+The automated test performs these steps:
+
+1. **Initial State Check**: Verifies audio starts unmuted
+2. **Mute Audio**: Calls `muteAudio()` and verifies mute state
+3. **🎯 Device Switch While Muted**: Switches audio device and verifies mute state is preserved (THE FIX)
+4. **Unmute Audio**: Calls `unmuteAudio()` and verifies unmute state
+5. **Device Switch While Unmuted**: Switches audio device and verifies unmute state is preserved
+
+### Expected Results
+
+✅ **All tests should pass if the fix is working**:
+- ✅ Initial State: Audio starts unmuted
+- ✅ Mute Audio: Audio becomes muted
+- ✅ **Mute Preserved After Device Switch**: Audio remains muted (this was the bug!)
+- ✅ Unmute Audio: Audio becomes unmuted
+- ✅ Unmute Preserved After Device Switch: Audio remains unmuted
+
+❌ **If the fix is broken, you'll see**:
+- ❌ Mute Preserved After Device Switch: Audio becomes unmuted (the bug returns)
+
+## 🔧 API Endpoints
+
+The Flask app provides these endpoints:
+
+- `GET /` - Main test interface
+- `GET /api/token` - Generate JWT token
+- `GET /api/config` - Get SignalWire configuration
+- `GET /health` - Health check
+
+## 📁 Project Structure
+
+```
+flask-mute-test/
+├── app.py                 # Flask application with JWT generation
+├── requirements.txt       # Python dependencies
+├── templates/
+│   └── index.html        # Test interface with automated testing
+└── README.md             # This file
+```
+
+## 🔍 Troubleshooting
+
+### Common Issues
+
+1. **"Missing required environment variables"**
+   - Ensure all three environment variables are set correctly
+   - Double-check your SignalWire credentials
+
+2. **"Need at least 2 audio devices to run test"**
+   - Connect a USB headset or external microphone
+   - The test requires multiple audio input devices to switch between
+
+3. **JWT Token Generation Fails**
+   - Verify your API token has the correct permissions
+   - Check that your project ID is correct
+
+4. **Call Fails to Connect**
+   - Ensure destination number is valid and reachable
+   - Check your SignalWire project has calling enabled
+   - Verify browser permissions for microphone access
+
+### Debug Information
+
+- **Console Log**: Real-time logging appears in the web interface
+- **Browser Console**: Additional debug information in browser dev tools
+- **Flask Logs**: Server-side logs in the terminal running the Flask app
+
+### Health Check
+
+Visit `http://localhost:3000/health` to verify:
+- Flask app is running
+- Environment variables are loaded
+- SignalWire configuration is valid
+
+## 🧬 Technical Details
+
+### JWT Token Generation
+
+The Flask app generates JWT tokens using the SignalWire REST API endpoint:
+
+```python
+# Request to SignalWire REST API
+url = f"https://{SIGNALWIRE_SPACE}/api/relay/rest/jwt"
+payload = {
+    "resource": f"browser-{uuid.uuid4()}",  # Unique resource identifier
+    "expires_in": 60  # Token expires in 60 minutes
+}
+
+# Authentication using project ID and token
+auth = (SIGNALWIRE_PROJECT_ID, SIGNALWIRE_TOKEN)
+response = requests.post(url, json=payload, auth=auth)
+```
+
+This approach uses SignalWire's official JWT generation endpoint rather than manually creating JWT tokens.
+
+### The Fix Implementation
+
+The fix is in `packages/common/src/webrtc/BaseCall.ts`:
+
+```typescript
+async setAudioInDevice(deviceId: string): Promise<void> {
+  // ... get new stream and track ...
+  
+  // 🎯 THE FIX: Preserve enabled state from old track
+  const { localStream } = this.options
+  const oldAudioTracks = localStream.getAudioTracks()
+  if (oldAudioTracks.length > 0) {
+    audioTrack.enabled = oldAudioTracks[0].enabled  // Preserve mute state!
+  }
+  
+  // ... replace track and update stream ...
+}
+```
+
+## 🤝 Contributing
+
+To test changes to the SDK:
+
+1. **Make your changes** to the SDK source code in `packages/common/src/`
+
+2. **Build and copy the SDK**:
+   ```bash
+   ./build-and-copy-sdk.sh
+   ```
+
+3. **Restart the Flask app** to serve the new SDK:
+   ```bash
+   python app.py
+   ```
+
+4. **Refresh your browser** to load the updated SDK and **run the test** to verify your changes work
+
+### Development Workflow
+
+The Flask app is already configured to use the local SDK build. The workflow is:
+
+1. Edit SDK source code
+2. Run `./build-and-copy-sdk.sh` 
+3. Restart Flask app
+4. Test in browser
+
+This ensures you're always testing against your local changes rather than the CDN version.
+
+## 📄 License
+
+This example is part of the SignalWire Node.js SDK and follows the same MIT license. 
\ No newline at end of file
diff --git a/packages/js/examples/flask-mute-test/app.py b/packages/js/examples/flask-mute-test/app.py
new file mode 100644
index 00000000..03951152
--- /dev/null
+++ b/packages/js/examples/flask-mute-test/app.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+"""
+SignalWire Audio Mute Fix Test Server
+
+This Flask application provides:
+1. JWT token generation for SignalWire Browser SDK
+2. A test interface for verifying the audio mute state preservation fix
+3. Automatic configuration using environment variables
+
+Usage:
+    export SIGNALWIRE_SPACE="your-space.signalwire.com"
+    export SIGNALWIRE_PROJECT_ID="your-project-id"
+    export SIGNALWIRE_TOKEN="your-api-token"
+    python app.py
+"""
+
+import os
+import time
+import uuid
+import hmac
+import hashlib
+import base64
+import json
+import requests
+from datetime import datetime, timedelta
+from flask import Flask, render_template, jsonify, request
+from flask_cors import CORS
+
+app = Flask(__name__)
+CORS(app)
+
+# Configuration from environment variables
+SIGNALWIRE_SPACE = os.getenv('SIGNALWIRE_SPACE')
+SIGNALWIRE_PROJECT_ID = os.getenv('SIGNALWIRE_PROJECT_ID') 
+SIGNALWIRE_TOKEN = os.getenv('SIGNALWIRE_TOKEN')
+
+if not all([SIGNALWIRE_SPACE, SIGNALWIRE_PROJECT_ID, SIGNALWIRE_TOKEN]):
+    print("Error: Missing required environment variables:")
+    print("- SIGNALWIRE_SPACE")
+    print("- SIGNALWIRE_PROJECT_ID") 
+    print("- SIGNALWIRE_TOKEN")
+    exit(1)
+
+def generate_jwt_token():
+    """
+    Generate a JWT token for SignalWire Browser SDK using the REST API
+    Based on: https://developer.signalwire.com/sdks/browser-sdk/v2/
+    """
+    
+    # Use SignalWire REST API to generate JWT token
+    url = f"https://{SIGNALWIRE_SPACE}/api/relay/rest/jwt"
+    
+    # Set up authentication
+    auth = (SIGNALWIRE_PROJECT_ID, SIGNALWIRE_TOKEN)
+    
+    # Request payload
+    payload = {
+        "resource": f"browser-{uuid.uuid4()}",  # Unique resource identifier
+        "expires_in": 60  # Token expires in 60 minutes
+    }
+    
+    # Make the request
+    response = requests.post(
+        url,
+        json=payload,
+        auth=auth,
+        headers={'Content-Type': 'application/json'}
+    )
+    
+    if response.status_code == 200:
+        data = response.json()
+        return data.get('jwt_token')
+    else:
+        raise Exception(f"Failed to generate JWT token: {response.status_code} - {response.text}")
+
+@app.route('/')
+def index():
+    """Serve the main test interface"""
+    return render_template('index.html', 
+                         space=SIGNALWIRE_SPACE,
+                         project_id=SIGNALWIRE_PROJECT_ID)
+
+@app.route('/api/token', methods=['GET'])
+def get_token():
+    """Generate and return a new JWT token"""
+    try:
+        token = generate_jwt_token()
+        return jsonify({
+            'success': True,
+            'token': token,
+            'expires_in': 3600  # 60 minutes in seconds
+        })
+    except Exception as e:
+        print(f"Error generating JWT token: {str(e)}")
+        return jsonify({
+            'success': False,
+            'error': str(e)
+        }), 500
+
+@app.route('/api/config', methods=['GET'])
+def get_config():
+    """Return configuration for the frontend"""
+    return jsonify({
+        'space': SIGNALWIRE_SPACE,
+        'project_id': SIGNALWIRE_PROJECT_ID
+    })
+
+@app.route('/health', methods=['GET'])
+def health_check():
+    """Health check endpoint"""
+    return jsonify({
+        'status': 'healthy',
+        'timestamp': datetime.utcnow().isoformat(),
+        'space': SIGNALWIRE_SPACE,
+        'project_configured': bool(SIGNALWIRE_PROJECT_ID)
+    })
+
+if __name__ == '__main__':
+    print(f"Starting SignalWire Mute Fix Test Server...")
+    print(f"Space: {SIGNALWIRE_SPACE}")
+    print(f"Project ID: {SIGNALWIRE_PROJECT_ID}")
+    print(f"Server will be available at: http://localhost:3000")
+    print(f"Test interface at: http://localhost:3000")
+    
+    app.run(debug=True, host='0.0.0.0', port=3000) 
\ No newline at end of file
diff --git a/packages/js/examples/flask-mute-test/build-and-copy-sdk.sh b/packages/js/examples/flask-mute-test/build-and-copy-sdk.sh
new file mode 100755
index 00000000..a5e15772
--- /dev/null
+++ b/packages/js/examples/flask-mute-test/build-and-copy-sdk.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Build and Copy SDK Script
+# This script builds the SignalWire SDK and copies it to the Flask app
+
+set -e
+
+echo "🔨 Building SignalWire SDK with mute fix..."
+
+# Navigate to the project root
+cd ../../../..
+
+# Build the JavaScript SDK
+echo "📦 Running npm run setup js..."
+npm run setup js
+
+# Build development version (less minified)
+echo "📦 Building development version..."
+cd packages/js
+NODE_ENV=development npx webpack --mode development
+cd ../..
+
+# Copy the built SDK to the Flask app
+echo "📋 Copying built SDK to Flask app..."
+cp packages/js/dist/index.min.js packages/js/examples/flask-mute-test/static/signalwire.js
+
+echo "✅ SDK built and copied successfully!"
+echo "🎯 The Flask app will now use the local SDK with your mute fix."
+echo ""
+echo "💡 To test your changes:"
+echo "   1. Run this script after making SDK changes"
+echo "   2. Restart the Flask app (python app.py)"
+echo "   3. Refresh the browser to load the new SDK" 
\ No newline at end of file
diff --git a/packages/js/examples/flask-mute-test/requirements.txt b/packages/js/examples/flask-mute-test/requirements.txt
new file mode 100644
index 00000000..b3cafaeb
--- /dev/null
+++ b/packages/js/examples/flask-mute-test/requirements.txt
@@ -0,0 +1,4 @@
+Flask==2.3.3
+Flask-CORS==4.0.0
+Werkzeug==2.3.7
+requests==2.31.0 
\ No newline at end of file
diff --git a/packages/js/examples/flask-mute-test/run.sh b/packages/js/examples/flask-mute-test/run.sh
new file mode 100755
index 00000000..d7a18425
--- /dev/null
+++ b/packages/js/examples/flask-mute-test/run.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# SignalWire Audio Mute Fix Test - Flask Edition
+# Quick start script
+
+set -e
+
+echo "🎤 SignalWire Audio Mute Fix Test - Flask Edition"
+echo "=================================================="
+
+# Check if Python is installed
+if ! command -v python3 &> /dev/null; then
+    echo "❌ Python 3 is required but not installed."
+    echo "Please install Python 3.7+ and try again."
+    exit 1
+fi
+
+# Check if pip is installed
+if ! command -v pip3 &> /dev/null; then
+    echo "❌ pip3 is required but not installed."
+    echo "Please install pip3 and try again."
+    exit 1
+fi
+
+# Check environment variables
+if [ -z "$SIGNALWIRE_SPACE" ] || [ -z "$SIGNALWIRE_PROJECT_ID" ] || [ -z "$SIGNALWIRE_TOKEN" ]; then
+    echo "❌ Missing required environment variables:"
+    echo ""
+    echo "Please set the following environment variables:"
+    echo "export SIGNALWIRE_SPACE=\"your-space.signalwire.com\""
+    echo "export SIGNALWIRE_PROJECT_ID=\"your-project-id-here\""
+    echo "export SIGNALWIRE_TOKEN=\"your-api-token-here\""
+    echo ""
+    echo "Or create a .env file with these values."
+    exit 1
+fi
+
+# Install dependencies if requirements.txt exists and is newer than last install
+if [ -f "requirements.txt" ]; then
+    if [ ! -f ".last_install" ] || [ "requirements.txt" -nt ".last_install" ]; then
+        echo "📦 Installing Python dependencies..."
+        pip3 install -r requirements.txt
+        touch .last_install
+    else
+        echo "✅ Dependencies already installed"
+    fi
+fi
+
+echo ""
+echo "🚀 Starting Flask application..."
+echo "Space: $SIGNALWIRE_SPACE"
+echo "Project ID: $SIGNALWIRE_PROJECT_ID"
+echo ""
+echo "🌐 Open your browser to: http://localhost:3000"
+echo "Press Ctrl+C to stop the server"
+echo ""
+
+# Run the Flask app
+python3 app.py 
\ No newline at end of file
diff --git a/packages/js/examples/flask-mute-test/static/.keep b/packages/js/examples/flask-mute-test/static/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/js/examples/flask-mute-test/templates/index.html b/packages/js/examples/flask-mute-test/templates/index.html
new file mode 100644
index 00000000..3a16bfec
--- /dev/null
+++ b/packages/js/examples/flask-mute-test/templates/index.html
@@ -0,0 +1,594 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>SignalWire Audio Mute Fix Test</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+  <!-- Cross Browser WebRTC Adapter -->
+  <script type="text/javascript" src="https://webrtc.github.io/adapter/adapter-latest.js"></script>
+
+  <!-- Include the SignalWire Relay JS SDK (Local Build with Mute Fix) -->
+  <script type="text/javascript" src="/static/signalwire.js"></script>
+
+  <!-- Bootstrap for styling -->
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" />
+  <link rel="shortcut icon" href="https://signalwire.com/assets/images/favicon.ico" />
+  
+  <style>
+    .status-connected { color: #28a745; }
+    .status-disconnected { color: #dc3545; }
+    .status-connecting { color: #ffc107; }
+    .test-step { 
+      background-color: #f8f9fa; 
+      border-left: 4px solid #007bff; 
+      padding: 15px; 
+      margin: 10px 0; 
+    }
+    .test-result { 
+      padding: 10px; 
+      border-radius: 5px; 
+      margin: 5px 0; 
+    }
+    .test-pass { background-color: #d4edda; color: #155724; }
+    .test-fail { background-color: #f8d7da; color: #721c24; }
+    .console-log { 
+      background-color: #343a40; 
+      color: #ffffff; 
+      padding: 10px; 
+      border-radius: 5px; 
+      font-family: monospace; 
+      max-height: 300px; 
+      overflow-y: auto; 
+    }
+  </style>
+</head>
+<body class="bg-light">
+  <div class="container">
+    <div class="row pt-5">
+      <div class="col-12 pb-3">
+        <h1>🎤 SignalWire Audio Mute Fix Test</h1>
+        <p class="lead">
+          Automated test for verifying that audio mute state is preserved when switching input devices.
+        </p>
+        <div class="alert alert-info">
+          <strong>Space:</strong> {{ space }}<br>
+          <strong>Project ID:</strong> {{ project_id }}<br>
+          <strong>JWT:</strong> <span id="tokenStatus">Loading...</span><br>
+          <strong>SDK:</strong> <span class="badge badge-success">Local Build with Mute Fix</span>
+        </div>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="col-12 col-md-4">
+        <!-- Connection Panel -->
+        <div class="card mb-3">
+          <div class="card-body">
+            <h5 class="card-title">Connection</h5>
+            <button id="btnConnect" class="btn btn-block btn-success" onclick="connect()">Connect to SignalWire</button>
+            <button id="btnDisconnect" class="btn btn-block btn-danger d-none" onclick="disconnect()">Disconnect</button>
+            <div class="text-center mt-3">
+              <small>Status: <span id="connectStatus" class="status-disconnected">Not Connected</span></small>
+            </div>
+          </div>
+        </div>
+
+        <!-- Call Control Panel -->
+        <div class="card mb-3">
+          <div class="card-body">
+            <h5 class="card-title">Call Control</h5>
+            <div class="form-group">
+              <label for="number">Call To:</label>
+              <input type="text" class="form-control" id="number" placeholder="Enter number or SIP endpoint" value="+1234567890">
+            </div>
+            <div class="form-group">
+              <label for="numberFrom">Call From:</label>
+              <input type="text" class="form-control" id="numberFrom" placeholder="Your number" value="+1987654321">
+            </div>
+            <div class="form-check mb-3">
+              <input type="checkbox" id="audio" checked class="form-check-input">
+              <label class="form-check-label" for="audio">Enable Audio</label>
+            </div>
+            <div class="form-check mb-3">
+              <input type="checkbox" id="video" class="form-check-input">
+              <label class="form-check-label" for="video">Enable Video</label>
+            </div>
+            <button id="startCall" class="btn btn-primary btn-block" onClick="makeCall()" disabled="true">Start Call</button>
+            <button id="hangupCall" class="btn btn-danger btn-block d-none" onClick="hangup()" disabled="true">Hang Up</button>
+            <div class="text-center mt-2">
+              <small>Call Status: <span id="callStatus">None</span></small>
+            </div>
+          </div>
+        </div>
+
+        <!-- Test Control Panel -->
+        <div class="card">
+          <div class="card-body">
+            <h5 class="card-title">Automated Test</h5>
+            <button id="runTest" class="btn btn-warning btn-block" onclick="runAutomatedTest()" disabled="true">
+              🧪 Run Mute Fix Test
+            </button>
+            <div class="mt-2">
+              <small id="testStatus">Test not started</small>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="col-12 col-md-8">
+        <!-- Video Elements -->
+        <div class="row mb-3">
+          <div class="col-6">
+            <h5>Local Video</h5>
+            <video id="localVideo" autoplay="true" muted class="w-100" style="background-color: #000; border: 1px solid #ccc; border-radius: 5px; height: 200px;"></video>
+          </div>
+          <div class="col-6">
+            <h5>Remote Video</h5>
+            <video id="remoteVideo" autoplay="true" class="w-100" playsinline style="background-color: #000; border: 1px solid #ccc; border-radius: 5px; height: 200px;"></video>
+          </div>
+        </div>
+
+        <!-- Manual Controls -->
+        <div class="card mb-3" id="manualControls" style="display: none;">
+          <div class="card-body">
+            <h5 class="card-title">Manual Controls</h5>
+            <div class="row">
+              <div class="col-md-6">
+                <button id="muteAudio" class="btn btn-warning btn-block mb-2" onClick="toggleMute()" disabled="true">Mute Audio</button>
+                <button id="muteVideo" class="btn btn-warning btn-block mb-2" onClick="toggleVideoMute()" disabled="true">Mute Video</button>
+              </div>
+              <div class="col-md-6">
+                <select id="audioInputSelect" class="form-control mb-2" onChange="switchAudioDevice()" disabled="true">
+                  <option value="">Select Audio Input</option>
+                </select>
+                <select id="videoInputSelect" class="form-control mb-2" onChange="switchVideoDevice()" disabled="true">
+                  <option value="">Select Video Input</option>
+                </select>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- Test Results -->
+        <div class="card">
+          <div class="card-body">
+            <h5 class="card-title">Test Results</h5>
+            <div id="testResults">
+              <p class="text-muted">No tests run yet. Click "Run Mute Fix Test" to start.</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- Console Log -->
+        <div class="card mt-3">
+          <div class="card-body">
+            <h5 class="card-title">Console Log</h5>
+            <div id="consoleLog" class="console-log">
+              <div>Waiting for connection...</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <script type="text/javascript">
+    // Global variables
+    var client;
+    var currentCall = null;
+    var testResults = [];
+    var audioDevices = [];
+    var videoDevices = [];
+
+    // Logging function
+    function log(message, type = 'info') {
+      const timestamp = new Date().toLocaleTimeString();
+      const consoleLog = document.getElementById('consoleLog');
+      const div = document.createElement('div');
+      div.innerHTML = `[${timestamp}] ${message}`;
+      if (type === 'error') div.style.color = '#ff6b6b';
+      if (type === 'success') div.style.color = '#51cf66';
+      if (type === 'warning') div.style.color = '#ffd43b';
+      consoleLog.appendChild(div);
+      consoleLog.scrollTop = consoleLog.scrollHeight;
+      console.log(message);
+    }
+
+    // Initialize the application
+    async function init() {
+      try {
+        log('Fetching JWT token from server...');
+        const tokenResponse = await fetch('/api/token');
+        const tokenData = await tokenResponse.json();
+        
+        if (tokenData.success) {
+          document.getElementById('tokenStatus').textContent = 'Generated ✓';
+          log('JWT token generated successfully', 'success');
+          window.jwtToken = tokenData.token;
+        } else {
+          throw new Error(tokenData.error);
+        }
+        
+        // Populate device lists
+        await populateDeviceSelectors();
+        
+      } catch (error) {
+        log(`Error initializing: ${error.message}`, 'error');
+        document.getElementById('tokenStatus').textContent = 'Failed ✗';
+      }
+    }
+
+    // Connect to SignalWire
+    function connect() {
+      if (!window.jwtToken) {
+        log('No JWT token available', 'error');
+        return;
+      }
+
+      log('Connecting to SignalWire...');
+      
+      client = new Relay({
+        project: '{{ project_id }}',
+        token: window.jwtToken
+      });
+
+      client.remoteElement = 'remoteVideo';
+      client.localElement = 'localVideo';
+      
+      if (document.getElementById('audio').checked) {
+        client.enableMicrophone();
+      } else {
+        client.disableMicrophone();
+      }
+      
+      if (document.getElementById('video').checked) {
+        client.enableWebcam();
+      } else {
+        client.disableWebcam();
+      }
+
+      client.on('signalwire.ready', function() {
+        log('Connected to SignalWire', 'success');
+        document.getElementById('btnConnect').classList.add('d-none');
+        document.getElementById('btnDisconnect').classList.remove('d-none');
+        document.getElementById('connectStatus').textContent = 'Connected';
+        document.getElementById('connectStatus').className = 'status-connected';
+        document.getElementById('startCall').disabled = false;
+      });
+
+      client.on('signalwire.socket.close', function() {
+        log('Disconnected from SignalWire', 'warning');
+        document.getElementById('btnConnect').classList.remove('d-none');
+        document.getElementById('btnDisconnect').classList.add('d-none');
+        document.getElementById('connectStatus').textContent = 'Disconnected';
+        document.getElementById('connectStatus').className = 'status-disconnected';
+      });
+
+      client.on('signalwire.error', function(error) {
+        log(`SignalWire error: ${error}`, 'error');
+      });
+
+      client.on('signalwire.notification', handleNotification);
+
+      document.getElementById('connectStatus').textContent = 'Connecting...';
+      document.getElementById('connectStatus').className = 'status-connecting';
+      client.connect();
+    }
+
+    // Disconnect from SignalWire
+    function disconnect() {
+      log('Disconnecting...');
+      client.disconnect();
+    }
+
+    // Handle notifications
+    function handleNotification(notification) {
+      log(`Notification: ${notification.type}`);
+      switch (notification.type) {
+        case 'callUpdate':
+          handleCallUpdate(notification.call);
+          break;
+        case 'userMediaError':
+          log('User media error - check permissions', 'error');
+          break;
+      }
+    }
+
+    // Handle call state updates
+    function handleCallUpdate(call) {
+      currentCall = call;
+      log(`Call state: ${call.prevState} -> ${call.state}`);
+      document.getElementById('callStatus').textContent = call.state;
+
+      switch (call.state) {
+        case 'trying':
+          document.getElementById('startCall').classList.add('d-none');
+          document.getElementById('hangupCall').classList.remove('d-none');
+          document.getElementById('hangupCall').disabled = false;
+          break;
+        case 'active':
+          log('Call is active - enabling controls', 'success');
+          document.getElementById('startCall').classList.add('d-none');
+          document.getElementById('hangupCall').classList.remove('d-none');
+          document.getElementById('hangupCall').disabled = false;
+          document.getElementById('manualControls').style.display = 'block';
+          
+          // Enable controls
+          document.getElementById('muteAudio').disabled = false;
+          document.getElementById('muteVideo').disabled = false;
+          document.getElementById('audioInputSelect').disabled = false;
+          document.getElementById('videoInputSelect').disabled = false;
+          document.getElementById('runTest').disabled = false;
+          
+          populateDeviceSelectors();
+          break;
+        case 'hangup':
+        case 'destroy':
+          document.getElementById('startCall').classList.remove('d-none');
+          document.getElementById('hangupCall').classList.add('d-none');
+          document.getElementById('hangupCall').disabled = true;
+          document.getElementById('manualControls').style.display = 'none';
+          document.getElementById('runTest').disabled = true;
+          
+          // Reset controls
+          document.getElementById('muteAudio').disabled = true;
+          document.getElementById('muteVideo').disabled = true;
+          document.getElementById('audioInputSelect').disabled = true;
+          document.getElementById('videoInputSelect').disabled = true;
+          
+          if (call.state === 'destroy') {
+            currentCall = null;
+          }
+          break;
+      }
+    }
+
+    // Make a call
+    function makeCall() {
+      const params = {
+        destinationNumber: document.getElementById('number').value,
+        callerNumber: document.getElementById('numberFrom').value,
+        audio: document.getElementById('audio').checked,
+        video: document.getElementById('video').checked ? { aspectRatio: 16/9 } : false,
+      };
+
+      log(`Making call to ${params.destinationNumber}`);
+      currentCall = client.newCall(params);
+    }
+
+    // Hang up the call
+    function hangup() {
+      if (currentCall) {
+        log('Hanging up call');
+        currentCall.hangup();
+      }
+    }
+
+    // Toggle audio mute
+    function toggleMute() {
+      if (currentCall) {
+        currentCall.toggleAudioMute();
+        updateMuteButtonState();
+      }
+    }
+
+    // Toggle video mute
+    function toggleVideoMute() {
+      if (currentCall) {
+        currentCall.toggleVideoMute();
+        updateVideoMuteButtonState();
+      }
+    }
+
+    // Switch audio device
+    function switchAudioDevice() {
+      if (currentCall) {
+        const select = document.getElementById('audioInputSelect');
+        const deviceId = select.value;
+        if (deviceId) {
+          log(`Switching to audio device: ${deviceId}`);
+          currentCall.setAudioInDevice(deviceId).then(() => {
+            log('Audio device switched successfully', 'success');
+            updateMuteButtonState();
+          }).catch(error => {
+            log(`Error switching audio device: ${error}`, 'error');
+          });
+        }
+      }
+    }
+
+    // Switch video device
+    function switchVideoDevice() {
+      if (currentCall) {
+        const select = document.getElementById('videoInputSelect');
+        const deviceId = select.value;
+        if (deviceId) {
+          log(`Switching to video device: ${deviceId}`);
+          currentCall.setVideoDevice(deviceId).then(() => {
+            log('Video device switched successfully', 'success');
+            updateVideoMuteButtonState();
+          }).catch(error => {
+            log(`Error switching video device: ${error}`, 'error');
+          });
+        }
+      }
+    }
+
+    // Update mute button state
+    function updateMuteButtonState() {
+      if (currentCall) {
+        const muteButton = document.getElementById('muteAudio');
+        const audioTracks = currentCall.localStream.getAudioTracks();
+        if (audioTracks.length > 0) {
+          const isMuted = !audioTracks[0].enabled;
+          muteButton.textContent = isMuted ? 'Unmute Audio' : 'Mute Audio';
+          muteButton.className = isMuted ? 'btn btn-success btn-block mb-2' : 'btn btn-warning btn-block mb-2';
+          log(`Audio mute state: ${isMuted}`);
+          return isMuted;
+        }
+      }
+      return false;
+    }
+
+    // Update video mute button state
+    function updateVideoMuteButtonState() {
+      if (currentCall) {
+        const muteButton = document.getElementById('muteVideo');
+        const videoTracks = currentCall.localStream.getVideoTracks();
+        if (videoTracks.length > 0) {
+          const isMuted = !videoTracks[0].enabled;
+          muteButton.textContent = isMuted ? 'Unmute Video' : 'Mute Video';
+          muteButton.className = isMuted ? 'btn btn-success btn-block mb-2' : 'btn btn-warning btn-block mb-2';
+          log(`Video mute state: ${isMuted}`);
+          return isMuted;
+        }
+      }
+      return false;
+    }
+
+    // Populate device selectors
+    async function populateDeviceSelectors() {
+      try {
+        const devices = await navigator.mediaDevices.enumerateDevices();
+        const audioInputSelect = document.getElementById('audioInputSelect');
+        const videoInputSelect = document.getElementById('videoInputSelect');
+        
+        // Clear existing options
+        audioInputSelect.innerHTML = '<option value="">Select Audio Input</option>';
+        videoInputSelect.innerHTML = '<option value="">Select Video Input</option>';
+        
+        audioDevices = [];
+        videoDevices = [];
+        
+        devices.forEach(device => {
+          if (device.kind === 'audioinput') {
+            audioDevices.push(device);
+            const option = document.createElement('option');
+            option.value = device.deviceId;
+            option.textContent = device.label || `Audio Input ${device.deviceId.substring(0, 8)}`;
+            audioInputSelect.appendChild(option);
+          } else if (device.kind === 'videoinput') {
+            videoDevices.push(device);
+            const option = document.createElement('option');
+            option.value = device.deviceId;
+            option.textContent = device.label || `Video Input ${device.deviceId.substring(0, 8)}`;
+            videoInputSelect.appendChild(option);
+          }
+        });
+        
+        log(`Found ${audioDevices.length} audio devices, ${videoDevices.length} video devices`);
+      } catch (error) {
+        log(`Error enumerating devices: ${error}`, 'error');
+      }
+    }
+
+    // Run automated test
+    async function runAutomatedTest() {
+      if (!currentCall || currentCall.state !== 'active') {
+        log('Call must be active to run test', 'error');
+        return;
+      }
+
+      if (audioDevices.length < 2) {
+        log('Need at least 2 audio devices to run test', 'error');
+        return;
+      }
+
+      log('🧪 Starting automated mute fix test...', 'warning');
+      document.getElementById('testStatus').textContent = 'Running test...';
+      testResults = [];
+
+      try {
+        // Test 1: Verify initial unmuted state
+        log('Test 1: Verifying initial unmuted state');
+        const initialMuted = updateMuteButtonState();
+        addTestResult('Initial State', !initialMuted, 'Audio should start unmuted');
+
+        // Test 2: Mute audio
+        log('Test 2: Muting audio');
+        currentCall.muteAudio();
+        await sleep(500);
+        const mutedState = updateMuteButtonState();
+        addTestResult('Mute Audio', mutedState, 'Audio should be muted');
+
+        // Test 3: Switch device while muted (THE FIX)
+        log('Test 3: Switching device while muted (testing the fix)');
+        const originalDevice = audioDevices[0].deviceId;
+        const newDevice = audioDevices[1].deviceId;
+        
+        await currentCall.setAudioInDevice(newDevice);
+        await sleep(500);
+        const mutedAfterSwitch = updateMuteButtonState();
+        addTestResult('Mute Preserved After Device Switch', mutedAfterSwitch, 'Audio should remain muted after device switch');
+
+        // Test 4: Unmute and verify
+        log('Test 4: Unmuting audio');
+        currentCall.unmuteAudio();
+        await sleep(500);
+        const unmutedState = updateMuteButtonState();
+        addTestResult('Unmute Audio', !unmutedState, 'Audio should be unmuted');
+
+        // Test 5: Switch device while unmuted
+        log('Test 5: Switching device while unmuted');
+        await currentCall.setAudioInDevice(originalDevice);
+        await sleep(500);
+        const unmutedAfterSwitch = updateMuteButtonState();
+        addTestResult('Unmute Preserved After Device Switch', !unmutedAfterSwitch, 'Audio should remain unmuted after device switch');
+
+        // Display results
+        displayTestResults();
+        
+        const passed = testResults.filter(r => r.passed).length;
+        const total = testResults.length;
+        
+        if (passed === total) {
+          log(`✅ All tests passed! (${passed}/${total})`, 'success');
+          document.getElementById('testStatus').textContent = `✅ All tests passed! (${passed}/${total})`;
+        } else {
+          log(`❌ Some tests failed (${passed}/${total})`, 'error');
+          document.getElementById('testStatus').textContent = `❌ Tests failed (${passed}/${total})`;
+        }
+
+      } catch (error) {
+        log(`Test error: ${error}`, 'error');
+        document.getElementById('testStatus').textContent = 'Test failed with error';
+      }
+    }
+
+    // Helper function to add test result
+    function addTestResult(testName, passed, description) {
+      testResults.push({
+        name: testName,
+        passed: passed,
+        description: description
+      });
+      log(`${passed ? '✅' : '❌'} ${testName}: ${description}`, passed ? 'success' : 'error');
+    }
+
+    // Helper function to display test results
+    function displayTestResults() {
+      const resultsDiv = document.getElementById('testResults');
+      resultsDiv.innerHTML = '';
+      
+      testResults.forEach(result => {
+        const div = document.createElement('div');
+        div.className = `test-result ${result.passed ? 'test-pass' : 'test-fail'}`;
+        div.innerHTML = `
+          <strong>${result.passed ? '✅' : '❌'} ${result.name}</strong><br>
+          <small>${result.description}</small>
+        `;
+        resultsDiv.appendChild(div);
+      });
+    }
+
+    // Helper function to sleep
+    function sleep(ms) {
+      return new Promise(resolve => setTimeout(resolve, ms));
+    }
+
+    // Initialize when page loads
+    window.addEventListener('load', init);
+  </script>
+</body>
+</html> 
\ No newline at end of file
diff --git a/packages/js/examples/flask-mute-test/test_jwt.py b/packages/js/examples/flask-mute-test/test_jwt.py
new file mode 100644
index 00000000..17a0c0d8
--- /dev/null
+++ b/packages/js/examples/flask-mute-test/test_jwt.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+"""
+Test script to verify JWT generation works correctly
+"""
+
+import os
+import sys
+import requests
+import uuid
+
+# Configuration from environment variables
+SIGNALWIRE_SPACE = os.getenv('SIGNALWIRE_SPACE')
+SIGNALWIRE_PROJECT_ID = os.getenv('SIGNALWIRE_PROJECT_ID') 
+SIGNALWIRE_TOKEN = os.getenv('SIGNALWIRE_TOKEN')
+
+def test_jwt_generation():
+    """Test JWT token generation using SignalWire REST API"""
+    
+    print(f"Testing JWT generation...")
+    print(f"Space: {SIGNALWIRE_SPACE}")
+    print(f"Project ID: {SIGNALWIRE_PROJECT_ID}")
+    print(f"Token: {SIGNALWIRE_TOKEN[:10]}...")
+    
+    # Use SignalWire REST API to generate JWT token
+    url = f"https://{SIGNALWIRE_SPACE}/api/relay/rest/jwt"
+    
+    # Set up authentication
+    auth = (SIGNALWIRE_PROJECT_ID, SIGNALWIRE_TOKEN)
+    
+    # Request payload
+    payload = {
+        "resource": f"browser-{uuid.uuid4()}",  # Unique resource identifier
+        "expires_in": 60  # Token expires in 60 minutes
+    }
+    
+    print(f"Making request to: {url}")
+    print(f"Payload: {payload}")
+    
+    # Make the request
+    try:
+        response = requests.post(
+            url,
+            json=payload,
+            auth=auth,
+            headers={'Content-Type': 'application/json'}
+        )
+        
+        print(f"Response status: {response.status_code}")
+        print(f"Response headers: {dict(response.headers)}")
+        print(f"Response text: {response.text}")
+        
+        if response.status_code == 200:
+            data = response.json()
+            jwt_token = data.get('jwt_token')
+            print(f"✅ JWT token generated successfully!")
+            print(f"Token: {jwt_token[:50]}...")
+            return jwt_token
+        else:
+            print(f"❌ Failed to generate JWT token: {response.status_code} - {response.text}")
+            return None
+            
+    except Exception as e:
+        print(f"❌ Exception during JWT generation: {str(e)}")
+        return None
+
+if __name__ == '__main__':
+    if not all([SIGNALWIRE_SPACE, SIGNALWIRE_PROJECT_ID, SIGNALWIRE_TOKEN]):
+        print("❌ Missing required environment variables:")
+        print("- SIGNALWIRE_SPACE")
+        print("- SIGNALWIRE_PROJECT_ID") 
+        print("- SIGNALWIRE_TOKEN")
+        sys.exit(1)
+    
+    test_jwt_generation() 
\ No newline at end of file