diff --git a/lib/aprsme_web/components/layouts/app.html.heex b/lib/aprsme_web/components/layouts/app.html.heex
index 8e8c9c0..c885be8 100644
--- a/lib/aprsme_web/components/layouts/app.html.heex
+++ b/lib/aprsme_web/components/layouts/app.html.heex
@@ -1,3 +1,4 @@
+<% assigns = assign_new(assigns, :map_page, fn -> false end) %>
 <style>
   /* Map page specific styles */
   body.map-page header {
diff --git a/lib/aprsme_web/live/locale_hook.ex b/lib/aprsme_web/live/locale_hook.ex
index 6044b06..ff4e144 100644
--- a/lib/aprsme_web/live/locale_hook.ex
+++ b/lib/aprsme_web/live/locale_hook.ex
@@ -8,10 +8,14 @@ defmodule AprsmeWeb.LocaleHook do
   # Cache supported locales at compile time
   @supported_locales ~w(en es de fr)
 
-  def on_mount(:set_locale, _params, session, socket) do
+  def on_mount(:set_locale, params, session, socket) do
     locale = get_locale_from_session(session) || "en"
     Gettext.put_locale(AprsmeWeb.Gettext, locale)
-    {:cont, assign(socket, locale: locale)}
+
+    # Set map_page assign based on route
+    map_page = is_map_page?(params)
+
+    {:cont, assign(socket, locale: locale, map_page: map_page)}
   end
 
   defp get_locale_from_session(session) do
@@ -23,4 +27,18 @@ defmodule AprsmeWeb.LocaleHook do
         nil
     end
   end
+
+  defp is_map_page?(%{"callsign" => callsign}) when map_size(%{"callsign" => callsign}) == 1 do
+    # Root callsign route (e.g., /:callsign) is a map page
+    true
+  end
+
+  defp is_map_page?(%{}) do
+    # Root route (/) is a map page
+    true
+  end
+
+  defp is_map_page?(_) do
+    false
+  end
 end
diff --git a/lib/aprsme_web/live/map_live/callsign_view.ex b/lib/aprsme_web/live/map_live/callsign_view.ex
index 7f61989..62a1e59 100644
--- a/lib/aprsme_web/live/map_live/callsign_view.ex
+++ b/lib/aprsme_web/live/map_live/callsign_view.ex
@@ -61,8 +61,7 @@ defmodule AprsmeWeb.MapLive.CallsignView do
         latest_symbol_table_id: "/",
         latest_symbol_code: ">",
         # Flag to track if latest marker was already pushed
-        latest_marker_pushed: false,
-        map_page: true
+        latest_marker_pushed: false
       )
 
     if connected?(socket) do
diff --git a/lib/aprsme_web/live/map_live/index.ex b/lib/aprsme_web/live/map_live/index.ex
index 6568d2a..47dc1f0 100644
--- a/lib/aprsme_web/live/map_live/index.ex
+++ b/lib/aprsme_web/live/map_live/index.ex
@@ -55,8 +55,7 @@ defmodule AprsmeWeb.MapLive.Index do
        historical_hours: "1",
        packet_age_threshold: one_hour_ago,
        slideover_open: true,
-       deployed_at: deployed_at,
-       map_page: true
+       deployed_at: deployed_at
      )}
   end