From 1520a697ad43f3f023608f8012cce1f52926b5fe Mon Sep 17 00:00:00 2001
From: theguymadmax <theguymadmax@proton.me>
Date: Sat, 25 Oct 2025 11:33:11 -0400
Subject: [PATCH] Play selected song first with instant mix (#15133)

---
 Emby.Server.Implementations/Library/MusicManager.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Emby.Server.Implementations/Library/MusicManager.cs b/Emby.Server.Implementations/Library/MusicManager.cs
index e0c8ae371b..e19ad3ef6e 100644
--- a/Emby.Server.Implementations/Library/MusicManager.cs
+++ b/Emby.Server.Implementations/Library/MusicManager.cs
@@ -28,7 +28,9 @@ namespace Emby.Server.Implementations.Library
 
         public IReadOnlyList<BaseItem> GetInstantMixFromSong(Audio item, User? user, DtoOptions dtoOptions)
         {
-            return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
+            var instantMixItems = GetInstantMixFromGenres(item.Genres, user, dtoOptions);
+
+            return [item, .. instantMixItems.Where(i => !i.Id.Equals(item.Id))];
         }
 
         /// <inheritdoc />