diff --git a/lib/music_library/scrobble_activity.ex b/lib/music_library/scrobble_activity.ex
index 69790acb..43ba971a 100644
--- a/lib/music_library/scrobble_activity.ex
+++ b/lib/music_library/scrobble_activity.ex
@@ -1,7 +1,11 @@
 defmodule MusicLibrary.ScrobbleActivity do
   alias LastFm.Scrobble
   alias MusicBrainz.Release
-  alias MusicLibrary.{Artists, Collection, Wishlist}
+  alias MusicLibrary.{Artists, Collection, Secrets, Wishlist}
+
+  def can_scrobble? do
+    Secrets.get("last_fm_session_key") !== nil
+  end
 
   def scrobble(release_with_tracks, opts) when is_list(opts) do
     case opts do
@@ -26,7 +30,7 @@ defmodule MusicLibrary.ScrobbleActivity do
   end
 
   def scrobble(release_with_tracks, {:started_at, started_at}) do
-    session_key = MusicLibrary.Secrets.get!("last_fm_session_key").value
+    session_key = Secrets.get!("last_fm_session_key").value
 
     {scrobbles, _finished_at} =
       release_with_tracks
diff --git a/lib/music_library/secrets.ex b/lib/music_library/secrets.ex
index 5aa46246..59747296 100644
--- a/lib/music_library/secrets.ex
+++ b/lib/music_library/secrets.ex
@@ -11,4 +11,8 @@ defmodule MusicLibrary.Secrets do
   def get!(name) do
     Repo.get!(Secret, name)
   end
+
+  def get(name) do
+    Repo.get(Secret, name)
+  end
 end
diff --git a/lib/music_library_web/controllers/session_html/new.html.heex b/lib/music_library_web/controllers/session_html/new.html.heex
index 6e8ba6e8..d539ae68 100644
--- a/lib/music_library_web/controllers/session_html/new.html.heex
+++ b/lib/music_library_web/controllers/session_html/new.html.heex
@@ -35,8 +35,5 @@
         </button>
       </div>
     </.form>
-    <a href={LastFm.auth_url()} class="flex items-center justify-center">
-      Connect to Last.fm
-    </a>
   </div>
 </div>
diff --git a/lib/music_library_web/live/collection_live/show.ex b/lib/music_library_web/live/collection_live/show.ex
index 6da52ff2..1a3468f2 100644
--- a/lib/music_library_web/live/collection_live/show.ex
+++ b/lib/music_library_web/live/collection_live/show.ex
@@ -27,7 +27,10 @@ defmodule MusicLibraryWeb.CollectionLive.Show do
       Records.subscribe(record_id)
     end
 
-    {:ok, assign(socket, :release_with_tracks, nil)}
+    {:ok,
+     socket
+     |> assign(:can_scrobble?, ScrobbleActivity.can_scrobble?())
+     |> assign(:release_with_tracks, nil)}
   end
 
   @impl true
diff --git a/lib/music_library_web/live/collection_live/show.html.heex b/lib/music_library_web/live/collection_live/show.html.heex
index 1c61a0a9..21ba1cf3 100644
--- a/lib/music_library_web/live/collection_live/show.html.heex
+++ b/lib/music_library_web/live/collection_live/show.html.heex
@@ -282,8 +282,6 @@
 >
   <h3 class="text-lg font-semibold text-zinc-700 dark:text-zinc-300">{gettext("Tracks")}</h3>
 
-  <.button phx-click="scrobble_release">{gettext("Scrobble to Last.fm")}</.button>
-
   <div :if={@release_with_tracks} class="space-y-4 mt-4">
     <.async_result :let={release_with_tracks} assign={@release_with_tracks}>
       <:loading>
@@ -335,6 +333,24 @@
       </div>
     </.async_result>
   </div>
+
+  <.button :if={@can_scrobble?} phx-click="scrobble_release">
+    {gettext("Scrobble to Last.fm")}
+  </.button>
+  <a
+    :if={!@can_scrobble?}
+    class={[
+      "relative inline-flex items-center rounded-md",
+      "mt-4 px-3 py-2 text-xs sm:text-sm font-semibold",
+      "bg-zinc-900 hover:bg-zinc-800 dark:bg-zinc-100 dark:hover:bg-zinc-200",
+      "disabled:bg-zinc-300 dark:disabled:bg-zinc-300 disabled:active:text-white",
+      "text-white active:text-white/80 dark:text-zinc-900 dark:active:text-zinc-900/80",
+      "focus-visible:outline focus-visible:outline-offset-2 focus-visible:outline-zinc-600"
+    ]}
+    href={LastFm.auth_url()}
+  >
+    {gettext("Connect your Last.fm account")}
+  </a>
 </Fluxon.Components.Sheet.sheet>
 
 <.modal
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 67b40f43..ce369210 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -799,3 +799,8 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Scrobble to Last.fm"
 msgstr ""
+
+#: lib/music_library_web/live/collection_live/show.html.heex
+#, elixir-autogen, elixir-format
+msgid "Connect your Last.fm account"
+msgstr ""