diff --git a/lib/aprsme_web/live/map_live/index.ex b/lib/aprsme_web/live/map_live/index.ex
index 3da5274..87c17ea 100644
--- a/lib/aprsme_web/live/map_live/index.ex
+++ b/lib/aprsme_web/live/map_live/index.ex
@@ -225,11 +225,17 @@ defmodule AprsmeWeb.MapLive.Index do
       pending_batch_tasks: [],
       # Add missing assigns for components
       loading: false,
-      connection_status: "connected",
+      connection_status: get_initial_connection_status(),
       show_all_packets: true
     )
   end
 
+  defp get_initial_connection_status do
+    # Check if APRS connection is disabled
+    connection_disabled = Application.get_env(:aprsme, :disable_aprs_connection, false)
+    if connection_disabled, do: "disconnected", else: "connected"
+  end
+
   @spec assign_defaults(Socket.t(), DateTime.t()) :: Socket.t()
   defp assign_defaults(socket, one_hour_ago) do
     assign(socket,
@@ -267,7 +273,7 @@ defmodule AprsmeWeb.MapLive.Index do
       last_update_at: DateTime.utc_now(),
       # Add missing assigns for components
       loading: false,
-      connection_status: "connected",
+      connection_status: get_initial_connection_status(),
       show_all_packets: true
     )
   end