diff --git a/src/tui/main.go b/src/tui/main.go
index e9baaa3..f037832 100644
--- a/src/tui/main.go
+++ b/src/tui/main.go
@@ -547,7 +547,7 @@ func (m *mainModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			cmd := m.progress.SetPercent(float64(playing.Progress) / float64(playing.Item.Duration))
 			m.playing = playing
 			m.playbackContext = playbackContext
-			if m.mode == Queue {
+			if m.mode == Queue && len(m.list.Items()) != 0 {
 				if m.list.Items()[0].(mainItem).SpotifyItem.(spotify.FullTrack).Name != playing.Item.Name {
 					go func() {
 						new_items, err := QueueView(m.ctx, m.commands)
diff --git a/src/tui/views.go b/src/tui/views.go
index ee55b23..f2e8fbe 100644
--- a/src/tui/views.go
+++ b/src/tui/views.go
@@ -37,14 +37,16 @@ func QueueView(ctx *gctx.Context, commands *commands.Commands) ([]list.Item, err
 	if err != nil {
 		return nil, err
 	}
-	items = append(items, mainItem{
-		Name:        tracks.CurrentlyPlaying.Name,
-		Artist:      tracks.CurrentlyPlaying.Artists[0],
-		Duration:    tracks.CurrentlyPlaying.TimeDuration().Round(time.Second).String(),
-		ID:          tracks.CurrentlyPlaying.ID,
-		Desc:        tracks.CurrentlyPlaying.Artists[0].Name + " - " + tracks.CurrentlyPlaying.TimeDuration().Round(time.Second).String(),
-		SpotifyItem: tracks.CurrentlyPlaying,
-	})
+	if tracks.CurrentlyPlaying.Name != "" {
+		items = append(items, mainItem{
+			Name:        tracks.CurrentlyPlaying.Name,
+			Artist:      tracks.CurrentlyPlaying.Artists[0],
+			Duration:    tracks.CurrentlyPlaying.TimeDuration().Round(time.Second).String(),
+			ID:          tracks.CurrentlyPlaying.ID,
+			Desc:        tracks.CurrentlyPlaying.Artists[0].Name + " - " + tracks.CurrentlyPlaying.TimeDuration().Round(time.Second).String(),
+			SpotifyItem: tracks.CurrentlyPlaying,
+		})
+	}
 	for _, track := range tracks.Items {
 		items = append(items, mainItem{
 			Name:        track.Name,