diff --git a/android/app/src/main/java/com/thisux/droidclaw/data/SettingsStore.kt b/android/app/src/main/java/com/thisux/droidclaw/data/SettingsStore.kt
index 8bbed4a..68f046c 100644
--- a/android/app/src/main/java/com/thisux/droidclaw/data/SettingsStore.kt
+++ b/android/app/src/main/java/com/thisux/droidclaw/data/SettingsStore.kt
@@ -26,7 +26,7 @@ class SettingsStore(private val context: Context) {
     }
 
     val serverUrl: Flow<String> = context.dataStore.data.map { prefs ->
-        prefs[SettingsKeys.SERVER_URL] ?: "ws://localhost:8080"
+        prefs[SettingsKeys.SERVER_URL] ?: "wss://tunnel.droidclaw.ai"
     }
 
     val deviceName: Flow<String> = context.dataStore.data.map { prefs ->
diff --git a/android/app/src/main/java/com/thisux/droidclaw/ui/screens/SettingsScreen.kt b/android/app/src/main/java/com/thisux/droidclaw/ui/screens/SettingsScreen.kt
index bd0edda..dcb1f31 100644
--- a/android/app/src/main/java/com/thisux/droidclaw/ui/screens/SettingsScreen.kt
+++ b/android/app/src/main/java/com/thisux/droidclaw/ui/screens/SettingsScreen.kt
@@ -55,7 +55,7 @@ fun SettingsScreen() {
     val scope = rememberCoroutineScope()
 
     val apiKey by app.settingsStore.apiKey.collectAsState(initial = "")
-    val serverUrl by app.settingsStore.serverUrl.collectAsState(initial = "ws://localhost:8080")
+    val serverUrl by app.settingsStore.serverUrl.collectAsState(initial = "wss://tunnel.droidclaw.ai")
 
     var editingApiKey by remember(apiKey) { mutableStateOf(apiKey) }
     var editingServerUrl by remember(serverUrl) { mutableStateOf(serverUrl) }