diff --git a/assets/js/app.js b/assets/js/app.js
index d0b74cf..670e5f7 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -304,6 +304,7 @@ let liveSocket = new LiveSocket("/live", Socket, {
   longPollFallbackMs: 2500,
   params: { _csrf_token: csrfToken },
   hooks: Hooks,
+  timeout: 60000, // 60 second timeout for slow initial loads
 });
 
 // Show progress bar on live navigation and form submits
diff --git a/lib/aprsme_web/endpoint.ex b/lib/aprsme_web/endpoint.ex
index f519251..409c599 100644
--- a/lib/aprsme_web/endpoint.ex
+++ b/lib/aprsme_web/endpoint.ex
@@ -13,7 +13,7 @@ defmodule AprsmeWeb.Endpoint do
   ]
 
   socket "/live", Phoenix.LiveView.Socket,
-    websocket: [connect_info: [session: @session_options]],
+    websocket: [connect_info: [session: @session_options], timeout: 60_000],
     longpoll: [connect_info: [session: @session_options]]
 
   # Serve at "/" the static files from "priv/static" directory.