diff --git a/ui/browsing/nowplayingpage.go b/ui/browsing/nowplayingpage.go
index 3ec00ab..3cc6d28 100644
--- a/ui/browsing/nowplayingpage.go
+++ b/ui/browsing/nowplayingpage.go
@@ -203,17 +203,18 @@ func (a *NowPlayingPage) OnSongChange(song, lastScrobbledIfAny *mediaprovider.Tr
 		}
 	})
 
-	go func() {
-		if lp, ok := a.sm.Server.(mediaprovider.LyricsProvider); ok {
-			lyrics, err := lp.GetLyrics(song)
-			if err == nil {
+	if lp, ok := a.sm.Server.(mediaprovider.LyricsProvider); ok {
+		go func() {
+			if lyrics, err := lp.GetLyrics(song); err == nil {
 				a.lyricsViewer.SetLyrics(lyrics)
 			} else {
 				log.Printf("Error fetching lyrics: %v", err)
 				a.lyricsViewer.SetLyrics(nil)
 			}
-		}
-	}()
+		}()
+	} else {
+		a.lyricsViewer.SetLyrics(nil)
+	}
 }
 
 func (a *NowPlayingPage) OnPlayQueueChange() {
diff --git a/ui/widgets/lyricsviewer.go b/ui/widgets/lyricsviewer.go
index daffc61..81a2a01 100644
--- a/ui/widgets/lyricsviewer.go
+++ b/ui/widgets/lyricsviewer.go
@@ -13,9 +13,18 @@ type LyricsViewer struct {
 	noLyricsLabel  widget.Label
 	unsyncedViewer *widget.RichText
 
-	container *container.Scroll
+	container   *container.Scroll
+	currentView lyricView
 }
 
+type lyricView int
+
+const (
+	lyricViewEmpty lyricView = iota
+	lyricViewUnsynced
+	lyricViewSynced
+)
+
 func NewLyricsViewer() *LyricsViewer {
 	l := &LyricsViewer{noLyricsLabel: widget.Label{
 		Text: "Lyrics not available",
@@ -27,8 +36,11 @@ func NewLyricsViewer() *LyricsViewer {
 
 func (l *LyricsViewer) SetLyrics(lyrics *mediaprovider.Lyrics) {
 	if lyrics == nil || len(lyrics.Lines) == 0 {
-		l.container.Content = &l.noLyricsLabel
-		l.Refresh()
+		if l.currentView != lyricViewEmpty {
+			l.container.Content = &l.noLyricsLabel
+			l.currentView = lyricViewEmpty
+			l.Refresh()
+		}
 		return
 	}
 
@@ -36,7 +48,7 @@ func (l *LyricsViewer) SetLyrics(lyrics *mediaprovider.Lyrics) {
 		l.unsyncedViewer = widget.NewRichText()
 		l.unsyncedViewer.Wrapping = fyne.TextWrapWord
 	}
-	l.unsyncedViewer.Segments = l.unsyncedViewer.Segments[:0]
+	l.unsyncedViewer.Segments = nil
 	for _, line := range lyrics.Lines {
 		ts := &widget.TextSegment{Text: line.Text}
 		ts.Style.Alignment = fyne.TextAlignCenter
@@ -44,8 +56,12 @@ func (l *LyricsViewer) SetLyrics(lyrics *mediaprovider.Lyrics) {
 		ts.Style.Inline = false
 		l.unsyncedViewer.Segments = append(l.unsyncedViewer.Segments, ts)
 	}
-	l.container.Content = l.unsyncedViewer
-	l.Refresh()
+	l.unsyncedViewer.Refresh()
+	if l.currentView != lyricViewUnsynced {
+		l.container.Content = l.unsyncedViewer
+		l.currentView = lyricViewUnsynced
+		l.Refresh()
+	}
 }
 
 func (l *LyricsViewer) CreateRenderer() fyne.WidgetRenderer {