diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex
index a6d75ba..2979eb4 100644
--- a/lib/mv_web/components/layouts.ex
+++ b/lib/mv_web/components/layouts.ex
@@ -43,11 +43,11 @@ defmodule MvWeb.Layouts do
   slot :inner_block, required: true
 
   def app(assigns) do
-    club_name = get_club_name()
-    join_form_enabled = Mv.Membership.join_form_enabled?()
+    # Single get_settings() for layout; derive club_name and join_form_enabled to avoid duplicate query.
+    %{club_name: club_name, join_form_enabled: join_form_enabled} = get_layout_settings()
 
-    # TODO: get_join_form_enabled and unprocessed count run on every page load; consider
-    # loading count only on navigation or caching briefly if performance becomes an issue.
+    # TODO: unprocessed count runs on every page load when join form enabled; consider
+    # loading only on navigation or caching briefly if performance becomes an issue.
     unprocessed_join_requests_count =
       get_unprocessed_join_requests_count(assigns.current_user, join_form_enabled)
 
@@ -129,12 +129,17 @@ defmodule MvWeb.Layouts do
     """
   end
 
-  # Helper function to get club name from settings
-  # Falls back to "Mitgliederverwaltung" if settings can't be loaded
-  defp get_club_name do
+  # Single settings read for layout; returns club_name and join_form_enabled to avoid duplicate get_settings().
+  defp get_layout_settings do
     case Mv.Membership.get_settings() do
-      {:ok, settings} -> settings.club_name
-      _ -> "Mitgliederverwaltung"
+      {:ok, settings} ->
+        %{
+          club_name: settings.club_name || "Mitgliederverwaltung",
+          join_form_enabled: settings.join_form_enabled == true
+        }
+
+      _ ->
+        %{club_name: "Mitgliederverwaltung", join_form_enabled: false}
     end
   end
 
diff --git a/test/mv_web/live/group_live/show_test.exs b/test/mv_web/live/group_live/show_test.exs
index 1f0f1c2..4d64739 100644
--- a/test/mv_web/live/group_live/show_test.exs
+++ b/test/mv_web/live/group_live/show_test.exs
@@ -251,12 +251,10 @@ defmodule MvWeb.GroupLive.ShowTest do
                  has_element?(view, "[data-testid=group-show-members-table]", member.last_name)
       end)
 
-      # Verify query count is reasonable (should avoid N+1 queries)
-      # Expected: 1 query for group lookup + 1 query for members (with preload) + member_count aggregate
-      # Allow overhead for authorization, LiveView setup, and other initialization queries
-      # Note: member_count aggregate and authorization checks may add additional queries
-      assert final_count <= 20,
-             "Expected max 20 queries (group + members preload + member_count aggregate + LiveView setup + auth), got #{final_count}. This suggests N+1 query problem."
+      # Verify query count is reasonable (should avoid N+1 queries).
+      # Baseline: group + members preload + member_count aggregate + 1 layout get_settings + auth/role/join-count.
+      assert final_count <= 22,
+             "Expected max 22 queries (group + members preload + member_count + layout + auth), got #{final_count}. This suggests N+1 query problem."
     end
 
     test "slug lookup is efficient (uses unique_slug index)", %{conn: conn} do