diff --git a/src/renderer/features/player/hooks/use-handle-playqueue-add.ts b/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
index 1950b678..a6f0e50a 100644
--- a/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
+++ b/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
@@ -173,14 +173,12 @@ export const useHandlePlayQueueAdd = () => {
             if (playerType === PlaybackType.LOCAL) {
                 mpvPlayer!.volume(usePlayerStore.getState().volume);
 
-                if (playType === Play.NEXT || playType === Play.LAST) {
-                    mpvPlayer!.setQueueNext(playerData);
-                }
-
-                if (playType === Play.NOW) {
+                if (playType === Play.NOW || !hadSong) {
                     mpvPlayer!.pause();
                     mpvPlayer!.setQueue(playerData);
                     mpvPlayer!.play();
+                } else {
+                    mpvPlayer!.setQueueNext(playerData);
                 }
             }