diff --git a/src/components/app/providers/player.tsx b/src/components/app/providers/player.tsx
index ee0cc0e..284ed88 100644
--- a/src/components/app/providers/player.tsx
+++ b/src/components/app/providers/player.tsx
@@ -14,7 +14,7 @@ function ContextRichAudio({
   // biome-ignore lint/style/noNonNullAssertion :
   const { setMaxPosition, reactPosition } = usePosition()!
   // biome-ignore lint/style/noNonNullAssertion :
-  const { trackComplete } = useQueue()!
+  const { trackComplete, nextTrack } = useQueue()!
   return (
     // biome-ignore lint/a11y/useMediaCaption :
     <audio
@@ -30,6 +30,11 @@ function ContextRichAudio({
         trackComplete()
       }}
       className="hidden"
+      onError={() => {
+        if (!audioRef.current) return
+        if (audioRef.current.src === "") return
+        nextTrack()
+      }}
     />
   )
 }
@@ -37,11 +42,17 @@ function ContextRichAudio({
 function ContextRichOverlay() {
   // biome-ignore lint/style/noNonNullAssertion :
   const { track } = useTrack()!
+
+
+  if (track === null) {
+    return null
+  }
+
   return (
     <div
       className="z-10000 pointer-events-none fixed left-0 top-0 h-full w-full overflow-hidden bg-cover bg-center bg-no-repeat opacity-10 blur-xl"
       style={{
-        backgroundImage: `url('/api/covers/?id=${track?.id}&size=xl')`,
+        backgroundImage: `url('/api/covers/?id=${track.id}&size=xl')`,
       }}
     />
   )
diff --git a/src/components/app/providers/queue.tsx b/src/components/app/providers/queue.tsx
index 2b83b64..447ba12 100644
--- a/src/components/app/providers/queue.tsx
+++ b/src/components/app/providers/queue.tsx
@@ -33,7 +33,10 @@ const QueueProvider: React.FC<{
   const { loop } = useLoop()!
 
   const nextTrack = () => {
-    if (queue.length === 0) return
+    if (queue.length === 0) {
+      changeTrack(null, false)
+      return
+    } 
     const nextTrack = queue.shift()
     if (nextTrack) {
       setQueuePlayed([...queuePlayed, track])
diff --git a/src/components/app/providers/track.tsx b/src/components/app/providers/track.tsx
index 5ee3814..fced76d 100644
--- a/src/components/app/providers/track.tsx
+++ b/src/components/app/providers/track.tsx
@@ -27,7 +27,7 @@ const TrackProvider: React.FC<{
     playing.setPlayingFalse()
     position.changePosition([0])
     if (!audioRef.current) return
-    audioRef.current.src = `/api/track_data?id=${newTrack?.id}`
+    audioRef.current.src = newTrack ? `/api/track_data?id=${newTrack?.id}` : ''
     localStorage.setItem('track', JSON.stringify(newTrack))
 
     if (play) {