diff --git a/apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.ex b/apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.ex
index e22905b..0b7583a 100644
--- a/apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.ex
+++ b/apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.ex
@@ -14,12 +14,13 @@ defmodule LoLAnalyticsWeb.ChampionLive.Index do
   def mount(params, _session, socket) do
     role =
       case params["role"] do
+        nil -> "all"
         role -> role
-        _ -> "all"
       end
 
     socket =
       socket
+      |> assign(:selected_role, role)
       |> assign(:champions, %{status: :loading})
       |> load_champs(role)
 
diff --git a/apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.html.heex b/apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.html.heex
index a91d448..a33173a 100644
--- a/apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.html.heex
+++ b/apps/lol_analytics_web/lib/lol_analytics_web/live/champion_live/index.html.heex
@@ -7,7 +7,7 @@
 
   <div class="flex flex-col py-2 gap-2">
     <p>Roles</p>
-    <.live_component module={ChampionFilters} id="role-filters" selectedrole={@selected_role} />
+    <.live_component module={ChampionFilters} id="role-filters" selectedrole={@selected_role || "all" } />
   </div>
 
   <div class="h-4"></div>