diff --git a/DeepDrftPublic.Client/Pages/TrackDetail.razor b/DeepDrftPublic.Client/Pages/TrackDetail.razor
index 09befe3..33c0d14 100644
--- a/DeepDrftPublic.Client/Pages/TrackDetail.razor
+++ b/DeepDrftPublic.Client/Pages/TrackDetail.razor
@@ -1,5 +1,4 @@
 @page "/track/{EntryKey}"
-@rendermode InteractiveWebAssembly
 
 <PageTitle>@(ViewModel.Track?.TrackName ?? "Track") - DeepDrft</PageTitle>
 
@@ -24,7 +23,7 @@ else if (ViewModel.NotFound)
     <div class="deepdrft-track-detail-container">
         <div class="deepdrft-track-detail-masthead">
             <MudText Typo="Typo.h4" Align="Align.Center">Track not found.</MudText>
-            <MudText Typo="Typo.body2" Align="Align.Center" Class="mud-text-secondary">
+            <MudText Typo="Typo.body2" Align="Align.Center" Color="Color.Secondary">
                 This track may have been moved or removed.
             </MudText>
             <div class="d-flex justify-center mt-4">
diff --git a/DeepDrftPublic.Client/Pages/TrackDetail.razor.cs b/DeepDrftPublic.Client/Pages/TrackDetail.razor.cs
index 1c1e4c0..5111d20 100644
--- a/DeepDrftPublic.Client/Pages/TrackDetail.razor.cs
+++ b/DeepDrftPublic.Client/Pages/TrackDetail.razor.cs
@@ -67,9 +67,12 @@ public partial class TrackDetail : ComponentBase, IDisposable
     {
         if (ViewModel.Track is null) return;
 
-        // Resume the current track if it's merely paused; otherwise stream the new selection.
-        // SelectTrackStreaming is the live entry point — the buffered SelectTrack path is dead.
-        if (PlayerService.CurrentTrack?.Id == ViewModel.Track.Id && PlayerService.IsPaused)
+        var isThisTrack = PlayerService.CurrentTrack?.Id == ViewModel.Track.Id;
+
+        // Toggle play/pause if this track is already the active one (playing or paused);
+        // otherwise start a fresh stream. SelectTrackStreaming is the live entry point —
+        // the buffered SelectTrack path is dead.
+        if (isThisTrack && (PlayerService.IsPlaying || PlayerService.IsPaused))
         {
             await PlayerService.TogglePlayPause();
         }