diff --git a/src/App.svelte b/src/App.svelte
index 313cbfb8..a04d70ad 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -116,9 +116,9 @@
   })
 
   onReady(() => {
-    initializeRelayList().then(() => {
-      ready = true
-    })
+    ready = true
+
+    initializeRelayList()
 
     if (user.getProfile()) {
       loadAppData(user.getPubkey())
diff --git a/src/views/login/ConnectUser.svelte b/src/views/login/ConnectUser.svelte
index 2746a782..5f1a306f 100644
--- a/src/views/login/ConnectUser.svelte
+++ b/src/views/login/ConnectUser.svelte
@@ -72,7 +72,8 @@
         })
     }
 
-    if (all(isNil, Object.values(currentRelays)) && isNil(customRelayUrl)) {
+    // Wait for our relay list to load initially, then terminate when we've tried everything
+    if (allRelays.length > 0 && all(isNil, Object.values(currentRelays)) && isNil(customRelayUrl)) {
       modal = "failure"
       customRelayUrl = ""
     }