diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/Amber.kt b/app/src/main/java/com/greenart7c3/nostrsigner/Amber.kt
index f0a28c6d..64e4048c 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/Amber.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/Amber.kt
@@ -262,24 +262,10 @@ class Amber :
                     LocalPreferences.switchToAccount(this@Amber, LocalPreferences.allSavedAccounts(this@Amber).first().npub)
                 }
                 LocalPreferences.reloadApp()
+
+                // Start Tor immediately in the background without blocking app startup
                 if (settings.torMode == TorMode.BUILTIN && !BuildFlavorChecker.isOfflineFlavor()) {
-                    var attempt = 0
-                    while (!TorManager.isRunning.value) {
-                        if (attempt > 0) {
-                            TorManager.showRetrying()
-                            TorManager.stop()
-                            delay(3000)
-                        }
-                        TorManager.start(this@Amber, applicationIOScope)
-                        attempt++
-                        withTimeoutOrNull(120_000L) {
-                            TorManager.isRunning.first { it }
-                        }
-                    }
-                }
-                checkForNewRelaysAndUpdateAllFilters(true)
-                if (settings.killSwitch.value) {
-                    disconnectIntentionally()
+                    TorManager.start(this@Amber, applicationIOScope)
                 }
 
                 launch(Dispatchers.Main) {
@@ -307,7 +293,31 @@ class Amber :
                         }
                     })
                 }
+
+                // Signal app startup complete so UI shows immediately
                 isStartingApp.value = false
+
+                // Wait for Tor to be ready before establishing relay connections
+                if (settings.torMode == TorMode.BUILTIN && !BuildFlavorChecker.isOfflineFlavor()) {
+                    var attempt = 0
+                    while (!TorManager.isRunning.value) {
+                        if (attempt > 0) {
+                            TorManager.showRetrying()
+                            TorManager.stop()
+                            delay(3000)
+                            TorManager.start(this@Amber, applicationIOScope)
+                        }
+                        attempt++
+                        withTimeoutOrNull(120_000L) {
+                            TorManager.isRunning.first { it }
+                        }
+                    }
+                }
+
+                checkForNewRelaysAndUpdateAllFilters(true)
+                if (settings.killSwitch.value) {
+                    disconnectIntentionally()
+                }
             } catch (e: Exception) {
                 Log.e(TAG, "Failed to run migrations", e)
                 isStartingApp.value = false
@@ -317,6 +327,12 @@ class Amber :
         }
     }
 
+    suspend fun waitForTorIfNeeded() {
+        if (settings.torMode == TorMode.BUILTIN && !BuildFlavorChecker.isOfflineFlavor()) {
+            TorManager.isRunning.first { it }
+        }
+    }
+
     fun startServiceFromUi() {
         startService()
     }
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/ConnectivityService.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/ConnectivityService.kt
index 1a90a5a3..e727ffe6 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/service/ConnectivityService.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/ConnectivityService.kt
@@ -96,6 +96,8 @@ class ConnectivityService : Service() {
             while (Amber.instance.isStartingAppState.value) {
                 delay(1000)
             }
+            // Wait for Tor to be ready before connecting (if using built-in Tor)
+            Amber.instance.waitForTorIfNeeded()
             if (!BuildFlavorChecker.isOfflineFlavor() && !Amber.instance.settings.killSwitch.value) {
                 Amber.instance.client.connect()
                 Amber.instance.applicationIOScope.launch {