diff --git a/js/player.js b/js/player.js
index 7e4110f..8f68ea2 100644
--- a/js/player.js
+++ b/js/player.js
@@ -205,7 +205,6 @@ export class Player {
         document.title = `${trackTitle} • ${getTrackArtists(track)}`;
 
         this.updatePlayingTrackIndicator();
-        this.updateMediaSession(track);
 
         try {
             let streamUrl;
@@ -228,6 +227,8 @@ export class Player {
             }
             await this.audio.play();
 
+            // Update Media Session AFTER play starts to ensure metadata is captured
+            this.updateMediaSession(track);
             this.updateMediaSessionPlaybackState();
             this.preloadNextTracks();
         } catch (error) {
@@ -468,6 +469,9 @@ export class Player {
     updateMediaSession(track) {
         if (!('mediaSession' in navigator)) return;
 
+        // Force a refresh for picky Bluetooth systems by clearing metadata first
+        navigator.mediaSession.metadata = null;
+
         const artwork = [];
         const sizes = ['320'];
         const coverId = track.album?.cover;