diff --git a/src/renderer/components/audio-player/index.tsx b/src/renderer/components/audio-player/index.tsx
index 4c924c10..7c4f08a4 100644
--- a/src/renderer/components/audio-player/index.tsx
+++ b/src/renderer/components/audio-player/index.tsx
@@ -176,9 +176,18 @@ export const AudioPlayer = forwardRef(
         useEffect(() => {
             if (status === PlayerStatus.PLAYING) {
                 if (currentPlayer === 1) {
-                    player1Ref.current?.getInternalPlayer()?.play();
+                    // calling play() is not necessarily a safe option (https://developer.chrome.com/blog/play-request-was-interrupted)
+                    // In practice, this failure is only likely to happen when using the 0-second wav:
+                    // play() + play() in rapid succession will cause problems as the frist one ends the track.
+                    player1Ref.current
+                        ?.getInternalPlayer()
+                        ?.play()
+                        .catch(() => {});
                 } else {
-                    player2Ref.current?.getInternalPlayer()?.play();
+                    player2Ref.current
+                        ?.getInternalPlayer()
+                        ?.play()
+                        .catch(() => {});
                 }
             } else {
                 player1Ref.current?.getInternalPlayer()?.pause();
@@ -340,7 +349,8 @@ export const AudioPlayer = forwardRef(
                     url={player1?.streamUrl || EMPTY_SOURCE}
                     volume={webAudio ? 1 : volume}
                     width={0}
-                    onEnded={handleOnEnded}
+                    // If there is no stream url, we do not need to handle when the audio finishes
+                    onEnded={player1?.streamUrl ? handleOnEnded : undefined}
                     onProgress={
                         playbackStyle === PlaybackStyle.GAPLESS ? handleGapless1 : handleCrossfade1
                     }
@@ -359,7 +369,7 @@ export const AudioPlayer = forwardRef(
                     url={player2?.streamUrl || EMPTY_SOURCE}
                     volume={webAudio ? 1 : volume}
                     width={0}
-                    onEnded={handleOnEnded}
+                    onEnded={player2?.streamUrl ? handleOnEnded : undefined}
                     onProgress={
                         playbackStyle === PlaybackStyle.GAPLESS ? handleGapless2 : handleCrossfade2
                     }
diff --git a/src/renderer/components/audio-player/utils/list-handlers.ts b/src/renderer/components/audio-player/utils/list-handlers.ts
index 459de694..4fe5bb69 100644
--- a/src/renderer/components/audio-player/utils/list-handlers.ts
+++ b/src/renderer/components/audio-player/utils/list-handlers.ts
@@ -23,7 +23,10 @@ export const gaplessHandler = (args: {
 
     const durationPadding = isFlac ? 0.065 : 0.116;
     if (currentTime + durationPadding >= duration) {
-        return nextPlayerRef.current.getInternalPlayer()?.play();
+        return nextPlayerRef.current
+            .getInternalPlayer()
+            ?.play()
+            .catch(() => {});
     }
 
     return null;
@@ -61,7 +64,10 @@ export const crossfadeHandler = (args: {
 
         if (shouldBeginTransition) {
             setIsTransitioning(true);
-            return nextPlayerRef.current.getInternalPlayer().play();
+            return nextPlayerRef.current
+                .getInternalPlayer()
+                ?.play()
+                .catch(() => {});
         }
         return null;
     }
diff --git a/src/renderer/features/player/hooks/use-center-controls.ts b/src/renderer/features/player/hooks/use-center-controls.ts
index 4c2410fb..3b1eba24 100644
--- a/src/renderer/features/player/hooks/use-center-controls.ts
+++ b/src/renderer/features/player/hooks/use-center-controls.ts
@@ -138,7 +138,10 @@ export const useCenterControls = (args: { playersRef: any }) => {
             mpvPlayer?.volume(usePlayerStore.getState().volume);
             mpvPlayer!.play();
         } else {
-            currentPlayerRef.getInternalPlayer().play();
+            currentPlayerRef
+                .getInternalPlayer()
+                ?.play()
+                .catch(() => {});
         }
 
         play();