diff --git a/src/components/Queue.svelte b/src/components/Queue.svelte
index a7ac631..7f54242 100644
--- a/src/components/Queue.svelte
+++ b/src/components/Queue.svelte
@@ -3,10 +3,10 @@
         <div class="queue__sectionTitle">Next song</div>
         <div class="track">
             <div class="track__main" on:click={() => select($next)}>
-                <div class="track__title" class:placeholder={!$next}>
+                <div class="track__title" class:placeholder={!$next && $enqueueing}>
                     {#if $next}{$next.media.title}{/if}
                 </div>
-                <div class="track__subtitle" class:placeholder={!$next}>
+                <div class="track__subtitle" class:placeholder={!$next && $enqueueing}>
                 {#if $next}
                     shared by <span class="track__username">{$next.referer.username}</span> •
                     <DistanceDate date={$next.referer.date} />
diff --git a/src/components/Radio.svelte b/src/components/Radio.svelte
index b763350..ea40d7e 100644
--- a/src/components/Radio.svelte
+++ b/src/components/Radio.svelte
@@ -81,8 +81,14 @@
 
                         $iterator.next().then(({ done, value }) => {
                             enqueueing.set(false)
-                            $next = value
-                            set($next)
+
+                            if (done) {
+                                console.log('done')
+                                set(null)
+                            } else {
+                                $next = value
+                                set($next)
+                            }
                         }).catch(console.error)
                     }
                 })