diff --git a/daemon/controls.go b/daemon/controls.go
index 302f92a8..bf163181 100644
--- a/daemon/controls.go
+++ b/daemon/controls.go
@@ -263,12 +263,19 @@ func (p *AppPlayer) loadContext(ctx context.Context, spotCtx *connectpb.Context,
 		}
 	}
 
-	if p.state.player.ContextMetadata == nil {
-		p.state.player.ContextMetadata = map[string]string{}
-	}
+	// Replace (don't merge): this is a fresh context, so metadata from the
+	// previous one must not linger. Copy the play command's metadata, then
+	// overlay the resolved context's metadata (ctxTracks.Metadata()), which
+	// carries context_description — the label Spotify renders as "Next from: …"
+	// (linked to ContextUri) — that the command alone usually omits. Mirrors the
+	// transfer path in player.go.
+	p.state.player.ContextMetadata = map[string]string{}
 	for k, v := range spotCtx.Metadata {
 		p.state.player.ContextMetadata[k] = v
 	}
+	for k, v := range ctxTracks.Metadata() {
+		p.state.player.ContextMetadata[k] = v
+	}
 
 	p.state.player.Timestamp = time.Now().UnixMilli()
 	p.state.player.PositionAsOfTimestamp = 0
@@ -504,7 +511,15 @@ func (p *AppPlayer) setQueue(ctx context.Context, prev []*connectpb.ContextTrack
 
 	p.state.tracks.SetQueue(prev, next)
 	p.state.player.PrevTracks = p.state.tracks.PrevTracks()
-	p.state.player.NextTracks = p.state.tracks.NextTracks(ctx, next)
+	// Report upcoming tracks from our own list (queue + context iterator) rather
+	// than echoing the command's next_tracks hint. On a context switch the
+	// controller can send a set_queue whose next_tracks still lead with the
+	// previous context's leftovers; echoing them shows tracks under "Next from:"
+	// that will never play, since advanceNext follows this same list, not the
+	// hint. SetQueue above already captured the (is_queued) manual queue from the
+	// hint, so only the reorder-by-hint of context tracks is dropped — and that
+	// never affected playback anyway.
+	p.state.player.NextTracks = p.state.tracks.NextTracks(ctx, nil)
 	p.updateState(ctx)
 
 	// The upcoming track may have changed: a stream prefetched under the old