diff --git a/lib/music_library/scrobble_activity.ex b/lib/music_library/scrobble_activity.ex
index ebc58005..54eb478e 100644
--- a/lib/music_library/scrobble_activity.ex
+++ b/lib/music_library/scrobble_activity.ex
@@ -360,21 +360,17 @@ defmodule MusicLibrary.ScrobbleActivity do
   end
 
   @doc """
-  Gets top artists for multiple time periods (30, 90, 365 days) and all time.
-  Returns a map with the results for each period.
+  Gets top artists for a time period (30, 90, 365 days) and all time.
   """
-  def get_top_artists_by_periods(opts) do
-    last_30_days = get_top_artists_by_days(30, opts)
-    last_90_days = get_top_artists_by_days(90, opts)
-    last_365_days = get_top_artists_by_days(365, opts)
-    all_time = get_top_artists(opts)
+  def get_top_artists_by_period(opts) do
+    period = Keyword.get(opts, :period, :last_30_days)
 
-    %{
-      last_30_days: last_30_days,
-      last_90_days: last_90_days,
-      last_365_days: last_365_days,
-      all_time: all_time
-    }
+    case period do
+      :all_time -> get_top_artists(opts)
+      :last_30_days -> get_top_artists_by_days(30, opts)
+      :last_90_days -> get_top_artists_by_days(90, opts)
+      :last_365_days -> get_top_artists_by_days(365, opts)
+    end
   end
 
   defp resolve_timezone! do
diff --git a/lib/music_library_web/components/stats_components.ex b/lib/music_library_web/components/stats_components.ex
index ab9fb13c..972125c9 100644
--- a/lib/music_library_web/components/stats_components.ex
+++ b/lib/music_library_web/components/stats_components.ex
@@ -66,51 +66,6 @@ defmodule MusicLibraryWeb.StatsComponents do
     """
   end
 
-  attr :artists, :list, required: true
-
-  def top_artists_by_period(assigns) do
-    ~H"""
-    <div class="mt-4">
-      <div class="space-y-2">
-        <div
-          :for={artist <- @artists}
-          phx-click={
-            artist.artist_musicbrainz_id != "" &&
-              JS.navigate(~p"/artists/#{artist.artist_musicbrainz_id}")
-          }
-          class={[
-            "flex items-center space-x-3 p-2",
-            artist.artist_musicbrainz_id != "" &&
-              "cursor-pointer hover:bg-zinc-50 dark:hover:bg-zinc-800"
-          ]}
-        >
-          <img
-            :if={artist.artist_musicbrainz_id != ""}
-            class="w-12 h-12 rounded-md object-cover"
-            src={~p"/artists/#{artist.artist_musicbrainz_id}/image"}
-            alt={artist.artist_name}
-            onerror={"this.src = '" <> ~p"/images/cover-not-found.png" <> "';"}
-          />
-          <div
-            :if={artist.artist_musicbrainz_id == ""}
-            class="w-12 h-12 rounded-md bg-zinc-200 dark:bg-zinc-700 flex items-center justify-center"
-          >
-            <.icon name="hero-user" class="w-6 h-6 text-zinc-400" />
-          </div>
-          <div class="flex-1 min-w-0">
-            <p class="text-sm font-medium text-zinc-900 dark:text-zinc-300 hover:text-zinc-700 dark:hover:text-zinc-400 truncate">
-              {artist.artist_name}
-            </p>
-          </div>
-          <.badge>
-            {artist.play_count}
-          </.badge>
-        </div>
-      </div>
-    </div>
-    """
-  end
-
   def refresh_lastfm_feed_button(assigns) do
     ~H"""
     <button
diff --git a/lib/music_library_web/live/stats_live/index.ex b/lib/music_library_web/live/stats_live/index.ex
index 72a25fe6..b541e605 100644
--- a/lib/music_library_web/live/stats_live/index.ex
+++ b/lib/music_library_web/live/stats_live/index.ex
@@ -6,7 +6,7 @@ defmodule MusicLibraryWeb.StatsLive.Index do
   import MusicLibraryWeb.StatsComponents
 
   alias MusicLibrary.{Collection, Records, ScrobbleActivity, Wishlist}
-  alias MusicLibraryWeb.StatsLive.TopAlbums
+  alias MusicLibraryWeb.StatsLive.{TopAlbums, TopArtists}
 
   def mount(_params, _session, socket) do
     latest_record = Collection.get_latest_record!()
@@ -29,7 +29,6 @@ defmodule MusicLibraryWeb.StatsLive.Index do
      )
      |> assign_counts()
      |> assign_scrobble_activity(recent_tracks)
-     |> assign_top_artists()
      |> assign(
        scrobble_activity_mode: "albums",
        latest_record: latest_record,
@@ -87,7 +86,6 @@ defmodule MusicLibraryWeb.StatsLive.Index do
 
     {:noreply,
      socket
-     |> assign_top_artists()
      |> assign_scrobble_activity(recent_tracks)}
   end
 
@@ -128,22 +126,6 @@ defmodule MusicLibraryWeb.StatsLive.Index do
     )
   end
 
-  defp assign_top_artists(socket) do
-    timezone = socket.assigns.timezone
-    current_time = DateTime.utc_now()
-
-    assign_async(socket, :top_artists, fn ->
-      top_artists =
-        ScrobbleActivity.get_top_artists_by_periods(
-          limit: 10,
-          current_time: current_time,
-          timezone: timezone
-        )
-
-      {:ok, %{top_artists: top_artists}}
-    end)
-  end
-
   # The Tailwind build step requires all needed classes to be explicitly referenced
   # in the source code, and not dynamically generated. This implies that one cannot
   # (for example) interpolate a number in a class name.
diff --git a/lib/music_library_web/live/stats_live/index.html.heex b/lib/music_library_web/live/stats_live/index.html.heex
index 131c2e36..846a9fbc 100644
--- a/lib/music_library_web/live/stats_live/index.html.heex
+++ b/lib/music_library_web/live/stats_live/index.html.heex
@@ -70,38 +70,7 @@
 
 <div>
   <div class="mt-5 grid grid-cols-1 lg:grid-cols-2 gap-5">
-    <div>
-      <h1 class="text-base lg:text-2xl text-zinc-900 dark:text-zinc-200 font-semibold">
-        {gettext("Top Artists")}
-      </h1>
-      <.async_result :let={top_artists} assign={@top_artists}>
-        <:loading>
-          <div class="h-192 flex items-center justify-center">
-            <.loading />
-          </div>
-        </:loading>
-        <.tabs class="mt-4">
-          <.tabs_list active_tab="top_artists_last_30_days" variant="segmented">
-            <:tab class="flex-1" name="top_artists_last_30_days">{gettext("Last 30 days")}</:tab>
-            <:tab class="flex-1" name="top_artists_last_90_days">{gettext("Last 90 days")}</:tab>
-            <:tab class="flex-1" name="top_artists_last_365_days">{gettext("Last year")}</:tab>
-            <:tab class="flex-1" name="top_artists_all_time">{gettext("All time")}</:tab>
-          </.tabs_list>
-          <.tabs_panel active name="top_artists_last_30_days">
-            <.top_artists_by_period artists={top_artists.last_30_days} />
-          </.tabs_panel>
-          <.tabs_panel name="top_artists_last_90_days">
-            <.top_artists_by_period artists={top_artists.last_90_days} />
-          </.tabs_panel>
-          <.tabs_panel name="top_artists_last_365_days">
-            <.top_artists_by_period artists={top_artists.last_365_days} />
-          </.tabs_panel>
-          <.tabs_panel name="top_artists_all_time">
-            <.top_artists_by_period artists={top_artists.all_time} />
-          </.tabs_panel>
-        </.tabs>
-      </.async_result>
-    </div>
+    <TopArtists.live id="top-artists" timezone={@timezone} />
     <TopAlbums.live id="top-albums" timezone={@timezone} />
   </div>
 </div>
diff --git a/lib/music_library_web/live/stats_live/top_artists.ex b/lib/music_library_web/live/stats_live/top_artists.ex
new file mode 100644
index 00000000..6254d4ae
--- /dev/null
+++ b/lib/music_library_web/live/stats_live/top_artists.ex
@@ -0,0 +1,158 @@
+defmodule MusicLibraryWeb.StatsLive.TopArtists do
+  use MusicLibraryWeb, :live_component
+
+  alias MusicLibrary.ScrobbleActivity
+
+  def live(assigns) do
+    ~H"""
+    <.live_component module={__MODULE__} {assigns} id={@id} />
+    """
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <div>
+      <h1 class="text-base lg:text-2xl text-zinc-900 dark:text-zinc-200 font-semibold">
+        {gettext("Top Artists")}
+      </h1>
+      <.tabs class="mt-4">
+        <.tabs_list active_tab={name_from_period(@period)} variant="segmented">
+          <:tab
+            class="flex-1"
+            name="top_artists_last_30_days"
+            phx-click={JS.push("set_period", value: %{period: "last_30_days"})}
+            phx-target={@myself}
+          >
+            {gettext("Last 30 days")}
+          </:tab>
+          <:tab
+            class="flex-1"
+            name="top_artists_last_90_days"
+            phx-click={JS.push("set_period", value: %{period: "last_90_days"})}
+            phx-target={@myself}
+          >
+            {gettext("Last 90 days")}
+          </:tab>
+          <:tab
+            class="flex-1"
+            name="top_artists_last_365_days"
+            phx-click={JS.push("set_period", value: %{period: "last_365_days"})}
+            phx-target={@myself}
+          >
+            {gettext("Last year")}
+          </:tab>
+          <:tab
+            class="flex-1"
+            name="top_artists_all_time"
+            phx-click={JS.push("set_period", value: %{period: "all_time"})}
+            phx-target={@myself}
+          >
+            {gettext("All time")}
+          </:tab>
+        </.tabs_list>
+        <.async_result :let={top_artists} assign={@top_artists}>
+          <:loading>
+            <div class="h-182 flex items-center justify-center">
+              <.loading />
+            </div>
+          </:loading>
+          <.top_artists_by_period artists={top_artists} />
+        </.async_result>
+      </.tabs>
+    </div>
+    """
+  end
+
+  defp name_from_period(period), do: "top_artists_#{period}"
+
+  @impl true
+  def mount(socket) do
+    {:ok,
+     socket
+     |> assign(:period, :last_30_days)}
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    {:ok,
+     socket
+     |> assign(assigns)
+     |> assign_top_artists()}
+  end
+
+  @impl true
+  def handle_event("set_period", %{"period" => period}, socket) do
+    {:noreply,
+     socket
+     |> assign(:period, String.to_existing_atom(period))
+     |> assign_top_artists()}
+  end
+
+  attr :artists, :list, required: true
+
+  def top_artists_by_period(assigns) do
+    ~H"""
+    <div class="mt-4">
+      <div class="space-y-2">
+        <div
+          :for={artist <- @artists}
+          phx-click={
+            artist.artist_musicbrainz_id != "" &&
+              JS.navigate(~p"/artists/#{artist.artist_musicbrainz_id}")
+          }
+          class={[
+            "flex items-center space-x-3 p-2",
+            artist.artist_musicbrainz_id != "" &&
+              "cursor-pointer hover:bg-zinc-50 dark:hover:bg-zinc-800"
+          ]}
+        >
+          <img
+            :if={artist.artist_musicbrainz_id != ""}
+            class="w-12 h-12 rounded-md object-cover"
+            src={~p"/artists/#{artist.artist_musicbrainz_id}/image"}
+            alt={artist.artist_name}
+            onerror={"this.src = '" <> ~p"/images/cover-not-found.png" <> "';"}
+          />
+          <div
+            :if={artist.artist_musicbrainz_id == ""}
+            class="w-12 h-12 rounded-md bg-zinc-200 dark:bg-zinc-700 flex items-center justify-center"
+          >
+            <.icon name="hero-user" class="w-6 h-6 text-zinc-400" />
+          </div>
+          <div class="flex-1 min-w-0">
+            <p class="text-sm font-medium text-zinc-900 dark:text-zinc-300 hover:text-zinc-700 dark:hover:text-zinc-400 truncate">
+              {artist.artist_name}
+            </p>
+          </div>
+          <.badge>
+            {artist.play_count}
+          </.badge>
+        </div>
+      </div>
+    </div>
+    """
+  end
+
+  defp assign_top_artists(socket) do
+    %{timezone: timezone, period: period} = socket.assigns
+    current_time = DateTime.utc_now()
+
+    assign_async(
+      socket,
+      :top_artists,
+      fn ->
+        top_artists =
+          ScrobbleActivity.get_top_artists_by_period(
+            limit: 10,
+            current_time: current_time,
+            timezone: timezone,
+            period: period
+          )
+
+        {:ok, %{top_artists: top_artists}}
+      end,
+      reset: true
+    )
+  end
+end
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index be6bbfc9..666551a1 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -893,14 +893,14 @@ msgstr ""
 msgid "Record deleted"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
 #: lib/music_library_web/live/stats_live/top_albums.ex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format
 msgid "Last 30 days"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
 #: lib/music_library_web/live/stats_live/top_albums.ex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format
 msgid "Last 90 days"
 msgstr ""
@@ -910,8 +910,8 @@ msgstr ""
 msgid "Top Albums"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
 #: lib/music_library_web/live/stats_live/top_albums.ex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format
 msgid "Last year"
 msgstr ""
@@ -931,13 +931,13 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format
 msgid "Top Artists"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
 #: lib/music_library_web/live/stats_live/top_albums.ex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format
 msgid "All time"
 msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 2a166a1c..07c9f683 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -893,14 +893,14 @@ msgstr ""
 msgid "Record deleted"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
 #: lib/music_library_web/live/stats_live/top_albums.ex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format
 msgid "Last 30 days"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
 #: lib/music_library_web/live/stats_live/top_albums.ex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format
 msgid "Last 90 days"
 msgstr ""
@@ -910,8 +910,8 @@ msgstr ""
 msgid "Top Albums"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
 #: lib/music_library_web/live/stats_live/top_albums.ex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Last year"
 msgstr ""
@@ -931,13 +931,13 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format, fuzzy
 msgid "Top Artists"
 msgstr ""
 
-#: lib/music_library_web/live/stats_live/index.html.heex
 #: lib/music_library_web/live/stats_live/top_albums.ex
+#: lib/music_library_web/live/stats_live/top_artists.ex
 #, elixir-autogen, elixir-format
 msgid "All time"
 msgstr ""