diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index dd6a55e..077dd14 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -420,8 +420,11 @@ defmodule MvWeb.MemberLive.Index do
 
   # Builds query parameters including field selection
   defp build_query_params(socket, base_params) do
+    # Use query from base_params if provided, otherwise fall back to socket.assigns.query
+    query_value = Map.get(base_params, "query") || socket.assigns.query || ""
+
     base_params
-    |> Map.put("query", socket.assigns.query || "")
+    |> Map.put("query", query_value)
     |> maybe_add_field_selection(socket.assigns[:user_field_selection])
   end